nmbd/nmbd_winsserver.c: Fixed printf style warning.

script/mkproto.awk: Added SMB_BIG_UINT.
Jeremy.
(This used to be commit c22c40f0caa7d6a9e8120e6415fa728db708db3e)

diff --git a/source3/include/proto.h b/source3/include/proto.h
index 8b063bcfd969d636bc8b7a6a3cc79b09a1f04d1f..d19188f8efd177003d7be6a308d71080aa38f688 100644 (file)
--- 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 72386bd55baa1e94761ccb05df2295b7419311ec..1ce9160deac31cf3f31e238b31d2864555ee4a5c 100644 (file)
--- 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 87c23915b08a182e00d24f9c6063d7ea1132469e..565f7c1e55cd192b2f2799d5ebc1f023c4a31679 100644 (file)
--- 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;
 }