From c11887e3257c8dfe650f5004106a43a891ab4b31 Mon Sep 17 00:00:00 2001
From: Jeremy Allison <jra@samba.org>
Date: Fri, 27 Apr 2001 22:17:10 +0000
Subject: More debug %d -> %u issues. Jeremy. (This used to be commit
 6fcb600dcd23c61d1a7d2ce8c2b7b2eea2e58623)

---
 source3/lib/messages.c         |  8 ++++----
 source3/printing/nt_printing.c | 12 ++++++------
 source3/smbd/quotas.c          | 11 +++--------
 3 files changed, 13 insertions(+), 18 deletions(-)

diff --git a/source3/lib/messages.c b/source3/lib/messages.c
index 5591f141cc..3b45a9c305 100644
--- a/source3/lib/messages.c
+++ b/source3/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/source3/printing/nt_printing.c b/source3/printing/nt_printing.c
index 0aa3b96cdd..3b937c9534 100644
--- a/source3/printing/nt_printing.c
+++ b/source3/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/source3/smbd/quotas.c b/source3/smbd/quotas.c
index 81da013cec..caf3997ba8 100644
--- a/source3/smbd/quotas.c
+++ b/source3/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;
-- 
cgit