diff options
| author | Andrew Tridgell <tridge@samba.org> | 1999-07-14 12:18:10 +0000 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 1999-07-14 12:18:10 +0000 |
| commit | c1f0ecfcf98313b3769b6630843d02c8c67d24cc (patch) | |
| tree | f6a94d87d0519bb674bb6b3265fa5f9771a9eaab | |
| parent | dfc3a9e781db8eb3e0d796892120acb4fe0f3f29 (diff) | |
| download | samba-c1f0ecfcf98313b3769b6630843d02c8c67d24cc.tar.gz | |
more pid_t cleanups from the 2.0 branch
| -rw-r--r-- | source/smbwrapper/smbsh.c | 2 | ||||
| -rw-r--r-- | source/smbwrapper/smbw.c | 4 | ||||
| -rw-r--r-- | source/tests/fcntl_lock.c | 3 | ||||
| -rw-r--r-- | source/tests/fcntl_lock64.c | 3 | ||||
| -rw-r--r-- | source/tests/shared_mmap.c | 2 |
5 files changed, 8 insertions, 6 deletions
diff --git a/source/smbwrapper/smbsh.c b/source/smbwrapper/smbsh.c index 8c9d00bd981..e11244d4fb3 100644 --- a/source/smbwrapper/smbsh.c +++ b/source/smbwrapper/smbsh.c @@ -93,7 +93,7 @@ int main(int argc, char *argv[]) sys_getwd(wd); - slprintf(line,sizeof(line)-1,"PWD_%d", getpid()); + slprintf(line,sizeof(line)-1,"PWD_%d", (int)getpid()); smbw_setshared(line, wd); diff --git a/source/smbwrapper/smbw.c b/source/smbwrapper/smbw.c index b8071b45a0b..79dfa7bd458 100644 --- a/source/smbwrapper/smbw.c +++ b/source/smbwrapper/smbw.c @@ -97,7 +97,7 @@ void smbw_init(void) DEBUG(2,("SMBW_PREFIX is %s\n", smbw_prefix)); } - slprintf(line,sizeof(line)-1,"PWD_%d", getpid()); + slprintf(line,sizeof(line)-1,"PWD_%d", (int)getpid()); p = smbw_getshared(line); if (!p) { @@ -1388,7 +1388,7 @@ int smbw_fork(void) smbw_srv_close(srv); } - slprintf(line,sizeof(line)-1,"PWD_%d", getpid()); + slprintf(line,sizeof(line)-1,"PWD_%d", (int)getpid()); smbw_setshared(line,smbw_cwd); /* unblock the parent */ diff --git a/source/tests/fcntl_lock.c b/source/tests/fcntl_lock.c index 6894ebfd661..32aecb87439 100644 --- a/source/tests/fcntl_lock.c +++ b/source/tests/fcntl_lock.c @@ -37,7 +37,8 @@ static int sys_waitpid(pid_t pid,int *status,int options) int main(int argc, char *argv[]) { struct flock lock; - int fd, pid, ret, status=1; + int fd, ret, status=1; + pid_t pid; if (!(pid=fork())) { sleep(2); diff --git a/source/tests/fcntl_lock64.c b/source/tests/fcntl_lock64.c index b15743cb691..a4b50dc57a2 100644 --- a/source/tests/fcntl_lock64.c +++ b/source/tests/fcntl_lock64.c @@ -33,7 +33,8 @@ static int sys_waitpid(pid_t pid,int *status,int options) int main(int argc, char *argv[]) { struct flock64 lock; - int fd, pid, ret, status=1; + int fd, ret, status=1; + pid_t pid; if (!(pid=fork())) { sleep(2); diff --git a/source/tests/shared_mmap.c b/source/tests/shared_mmap.c index c0b34e19579..fcef75d0d61 100644 --- a/source/tests/shared_mmap.c +++ b/source/tests/shared_mmap.c @@ -18,7 +18,7 @@ main() { int *buf; - int i, pid; + int i; int fd = open(DATA,O_RDWR|O_CREAT|O_TRUNC,0666); int count=7; |