More debug %d -> %u issues.

Jeremy.

diff --git a/source/lib/messages.c b/source/lib/messages.c
index 5591f141cc134de528f0bcf80f07f02c69425c7e..3b45a9c305cac8176cf0da143b16bf5f480f3bfe 100644 (file)
--- a/source/lib/messages.c
+++ b/source/lib/messages.c
@@ -70,7 +70,7 @@ a useful function for testing the message system
 ****************************************************************************/
 void ping_message(int msg_type, pid_t src, void *buf, size_t len)
 {
-       DEBUG(1,("INFO: Received PING message from PID %d\n",src));
+       DEBUG(1,("INFO: Received PING message from PID %u\n",(unsigned int)src));
        message_send_pid(src, MSG_PONG, buf, len, True);
 }
 /****************************************************************************
@@ -78,7 +78,7 @@ return current debug level
 ****************************************************************************/
 void debuglevel_message(int msg_type, pid_t src, void *buf, size_t len)
 {
-       DEBUG(1,("INFO: Received REQ_DEBUGLEVEL message from PID %d\n",src));
+       DEBUG(1,("INFO: Received REQ_DEBUGLEVEL message from PID %u\n",(unsigned int)src));
        message_send_pid(src, MSG_DEBUGLEVEL, DEBUGLEVEL_CLASS, sizeof(DEBUGLEVEL_CLASS), True);
 }
 
@@ -372,8 +372,8 @@ static int traverse_fn(TDB_CONTEXT *the_tdb, TDB_DATA kbuf, TDB_DATA dbuf, void
                
                /* if the pid was not found delete the entry from connections.tdb */
                if (errno == ESRCH) {
-                       DEBUG(2,("pid %d doesn't exist - deleting connections %d [%s]\n",
-                                       crec.pid, crec.cnum, crec.name));
+                       DEBUG(2,("pid %u doesn't exist - deleting connections %d [%s]\n",
+                                       (unsigned int)crec.pid, crec.cnum, crec.name));
                        tdb_delete(the_tdb, kbuf);
                }
        }

diff --git a/source/printing/nt_printing.c b/source/printing/nt_printing.c
index 0aa3b96cddb4424ae949d4fd614d3dff9f99f44a..3b937c9534bd0ab39bc8758b835c4af3f44c3901 100644 (file)
--- a/source/printing/nt_printing.c
+++ b/source/printing/nt_printing.c
@@ -3145,20 +3145,20 @@ BOOL nt_printing_getsec(TALLOC_CTX *ctx, char *printername, SEC_DESC_BUF **secde
        }
 
        if (DEBUGLEVEL >= 10) {
-               SEC_ACL *acl = (*secdesc_ctr)->sec->dacl;
+               SEC_ACL *the_acl = (*secdesc_ctr)->sec->dacl;
                int i;
 
                DEBUG(10, ("secdesc_ctr for %s has %d aces:\n", 
-                          printername, acl->num_aces));
+                          printername, the_acl->num_aces));
 
-               for (i = 0; i < acl->num_aces; i++) {
+               for (i = 0; i < the_acl->num_aces; i++) {
                        fstring sid_str;
 
-                       sid_to_string(sid_str, &acl->ace[i].sid);
+                       sid_to_string(sid_str, &the_acl->ace[i].sid);
 
                        DEBUG(10, ("%s %d %d 0x%08x\n", sid_str,
-                                  acl->ace[i].type, acl->ace[i].flags, 
-                                  acl->ace[i].info.mask)); 
+                                  the_acl->ace[i].type, the_acl->ace[i].flags, 
+                                  the_acl->ace[i].info.mask)); 
                }
        }
 

diff --git a/source/smbd/quotas.c b/source/smbd/quotas.c
index 81da013cec8d38f3c3a4ced612dd9e23c974da49..caf3997ba800cadb279f84deb0d05c06f0dedcca 100644 (file)
--- a/source/smbd/quotas.c
+++ b/source/smbd/quotas.c
@@ -277,11 +277,6 @@ static int xdr_getquota_args(XDR *xdrsp, struct getquota_args *args)
 
 static int xdr_getquota_rslt(XDR *xdrsp, struct getquota_rslt *gqr)
 {
-       gqr_status status;
-       union {
-               rquota gqr_rquota;
-       } getquota_rslt_u;
-  
        if (!xdr_int(xdrsp, &quotastat)) {
                DEBUG(6,("nfs_quotas: Status bad or zero\n"));
                return 0;
@@ -456,7 +451,7 @@ BOOL disk_quotas(char *path, SMB_BIG_UINT *bsize, SMB_BIG_UINT *dfree, SMB_BIG_U
                return(False) ;
   
        devno = sbuf.st_dev ;
-       DEBUG(5,("disk_quotas: looking for path \"%s\" devno=%x\n", path,devno));
+       DEBUG(5,("disk_quotas: looking for path \"%s\" devno=%x\n", path,(unsigned int)devno));
        if ( devno != devno_cached ) {
                devno_cached = devno ;
 #if defined(SUNOS5)
@@ -464,7 +459,7 @@ BOOL disk_quotas(char *path, SMB_BIG_UINT *bsize, SMB_BIG_UINT *dfree, SMB_BIG_U
                        return(False) ;
     
                found = False ;
-               slprintf(devopt, sizeof(devopt) - 1, "dev=%x", devno);
+               slprintf(devopt, sizeof(devopt) - 1, "dev=%x", (unsigned int)devno);
                while (getmntent(fd, &mnt) == 0) {
                        if( !hasmntopt(&mnt, devopt) )
                                continue;
@@ -491,7 +486,7 @@ BOOL disk_quotas(char *path, SMB_BIG_UINT *bsize, SMB_BIG_UINT *dfree, SMB_BIG_U
                while ((mnt = getmntent(fd)) != NULL) {
                        if ( sys_stat(mnt->mnt_dir,&sbuf) == -1 )
                                continue ;
-                       DEBUG(5,("disk_quotas: testing \"%s\" devno=%o\n", mnt->mnt_dir,sbuf.st_dev));
+                       DEBUG(5,("disk_quotas: testing \"%s\" devno=%x\n", mnt->mnt_dir,(unsigned int)sbuf.st_dev));
                        if (sbuf.st_dev == devno) {
                                found = True ;
                                break;