summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>1998-09-18 00:12:15 +0000
committerJeremy Allison <jra@samba.org>1998-09-18 00:12:15 +0000
commit1e17cbd2a3db061c8638ee8566ded53d14878bca (patch)
tree6175acdc16153a363d8613f58efd3a0f17413d51
parentb8b67f4fab4a6fd686c5796c2701882197a7bd9d (diff)
downloadsamba-1e17cbd2a3db061c8638ee8566ded53d14878bca.tar.gz
samba-1e17cbd2a3db061c8638ee8566ded53d14878bca.tar.bz2
samba-1e17cbd2a3db061c8638ee8566ded53d14878bca.zip
nmbd/nmbd_winsserver.c: Fixed printf style warning.
script/mkproto.awk: Added SMB_BIG_UINT. Jeremy. (This used to be commit c22c40f0caa7d6a9e8120e6415fa728db708db3e)
-rw-r--r--source3/include/proto.h1
-rw-r--r--source3/nmbd/nmbd_winsserver.c2
-rw-r--r--source3/script/mkproto.awk2
3 files changed, 3 insertions, 2 deletions
diff --git a/source3/include/proto.h b/source3/include/proto.h
index 8b063bcfd9..d19188f8ef 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -1670,6 +1670,7 @@ BOOL claim_connection(connection_struct *conn,char *name,int max_connections,BOO
/*The following definitions come from smbd/dfree.c */
+SMB_BIG_UINT sys_disk_free(char *path,SMB_BIG_UINT *bsize,SMB_BIG_UINT *dfree,SMB_BIG_UINT *dsize);
/*The following definitions come from smbd/dir.c */
diff --git a/source3/nmbd/nmbd_winsserver.c b/source3/nmbd/nmbd_winsserver.c
index 72386bd55b..1ce9160dea 100644
--- a/source3/nmbd/nmbd_winsserver.c
+++ b/source3/nmbd/nmbd_winsserver.c
@@ -1563,7 +1563,7 @@ void wins_write_database(BOOL background)
}
}
- slprintf(fname,sizeof(fname),"%s/%s.%d", lp_lockdir(), WINS_LIST, getpid());
+ slprintf(fname,sizeof(fname),"%s/%s.%d", lp_lockdir(), WINS_LIST, (unsigned int)getpid());
string_sub(fname,"//", "/");
if((fp = fopen(fnamenew,"w")) == NULL)
diff --git a/source3/script/mkproto.awk b/source3/script/mkproto.awk
index 87c23915b0..565f7c1e55 100644
--- a/source3/script/mkproto.awk
+++ b/source3/script/mkproto.awk
@@ -80,7 +80,7 @@ END {
next;
}
-!/^connection_struct|^pipes_struct|^file_fd_struct|^files_struct|^connection_struct|^uid_t|^gid_t|^unsigned|^mode_t|^DIR|^user|^int|^char|^uint|^struct|^BOOL|^void|^time|^smb_shm_offset_t|^shm_offset_t|^enum remote_arch_types|^FILE|^SMB_OFF_T|^size_t|^ssize_t/ {
+!/^connection_struct|^pipes_struct|^file_fd_struct|^files_struct|^connection_struct|^uid_t|^gid_t|^unsigned|^mode_t|^DIR|^user|^int|^char|^uint|^struct|^BOOL|^void|^time|^smb_shm_offset_t|^shm_offset_t|^enum remote_arch_types|^FILE|^SMB_OFF_T|^size_t|^ssize_t|^SMB_BIG_UINT/ {
next;
}