svn commit: samba r16283 - in trunk/source: nsswitch smbd utils
jra at samba.org
jra at samba.org
Fri Jun 16 01:46:58 GMT 2006
Author: jra
Date: 2006-06-16 01:46:56 +0000 (Fri, 16 Jun 2006)
New Revision: 16283
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=16283
Log:
Start fixing up gcc4 -O6 warnings on an x86_64 box. size_t != unsigned
int
in a format string.
Jeremy.
Modified:
trunk/source/nsswitch/winbindd_cache.c
trunk/source/nsswitch/winbindd_group.c
trunk/source/smbd/notify_fam.c
trunk/source/utils/net_ads.c
trunk/source/utils/net_rpc.c
trunk/source/utils/net_sam.c
Changeset:
Modified: trunk/source/nsswitch/winbindd_cache.c
===================================================================
--- trunk/source/nsswitch/winbindd_cache.c 2006-06-16 01:35:11 UTC (rev 16282)
+++ trunk/source/nsswitch/winbindd_cache.c 2006-06-16 01:46:56 UTC (rev 16283)
@@ -229,8 +229,8 @@
{
time_t ret;
if (centry->len - centry->ofs < sizeof(time_t)) {
- DEBUG(0,("centry corruption? needed %d bytes, have %d\n",
- sizeof(time_t), centry->len - centry->ofs));
+ DEBUG(0,("centry corruption? needed %u bytes, have %u\n",
+ (unsigned int)sizeof(time_t), (unsigned int)(centry->len - centry->ofs)));
smb_panic("centry_time");
}
ret = IVAL(centry->data, centry->ofs); /* FIXME: correct ? */
Modified: trunk/source/nsswitch/winbindd_group.c
===================================================================
--- trunk/source/nsswitch/winbindd_group.c 2006-06-16 01:35:11 UTC (rev 16282)
+++ trunk/source/nsswitch/winbindd_group.c 2006-06-16 01:46:56 UTC (rev 16283)
@@ -184,8 +184,8 @@
*gr_mem = buf;
*gr_mem_len = buf_len;
- DEBUG(10, ("num_mem = %d, len = %d, mem = %s\n", *num_gr_mem,
- buf_len, *num_gr_mem ? buf : "NULL"));
+ DEBUG(10, ("num_mem = %u, len = %u, mem = %s\n", (unsigned int)*num_gr_mem,
+ (unsigned int)buf_len, *num_gr_mem ? buf : "NULL"));
result = True;
done:
@@ -795,8 +795,8 @@
break;
}
- DEBUG(10, ("list_len = %d, mem_len = %d\n",
- gr_mem_list_len, gr_mem_len));
+ DEBUG(10, ("list_len = %d, mem_len = %u\n",
+ gr_mem_list_len, (unsigned int)gr_mem_len));
memcpy(&gr_mem_list[gr_mem_list_len], gr_mem,
gr_mem_len);
Modified: trunk/source/smbd/notify_fam.c
===================================================================
--- trunk/source/smbd/notify_fam.c 2006-06-16 01:35:11 UTC (rev 16282)
+++ trunk/source/smbd/notify_fam.c 2006-06-16 01:46:56 UTC (rev 16283)
@@ -371,7 +371,7 @@
}
if ((info = SMB_MALLOC_P(struct fam_req_info)) == NULL) {
- DEBUG(0, ("malloc of %d bytes failed\n", sizeof(struct fam_req_info)));
+ DEBUG(0, ("malloc of %u bytes failed\n", (unsigned int)sizeof(struct fam_req_info)));
return(NULL);
}
Modified: trunk/source/utils/net_ads.c
===================================================================
--- trunk/source/utils/net_ads.c 2006-06-16 01:35:11 UTC (rev 16282)
+++ trunk/source/utils/net_ads.c 2006-06-16 01:46:56 UTC (rev 16283)
@@ -863,8 +863,8 @@
if (strlen(global_myname()) > 15) {
d_printf("Our netbios name can be at most 15 chars long, "
- "\"%s\" is %d chars long\n",
- global_myname(), strlen(global_myname()));
+ "\"%s\" is %u chars long\n",
+ global_myname(), (unsigned int)strlen(global_myname()));
return -1;
}
Modified: trunk/source/utils/net_rpc.c
===================================================================
--- trunk/source/utils/net_rpc.c 2006-06-16 01:35:11 UTC (rev 16282)
+++ trunk/source/utils/net_rpc.c 2006-06-16 01:46:56 UTC (rev 16283)
@@ -396,8 +396,8 @@
if (strlen(global_myname()) > 15) {
d_printf("Our netbios name can be at most 15 chars long, "
- "\"%s\" is %d chars long\n",
- global_myname(), strlen(global_myname()));
+ "\"%s\" is %u chars long\n",
+ global_myname(), (unsigned int)strlen(global_myname()));
return -1;
}
Modified: trunk/source/utils/net_sam.c
===================================================================
--- trunk/source/utils/net_sam.c 2006-06-16 01:35:11 UTC (rev 16282)
+++ trunk/source/utils/net_sam.c 2006-06-16 01:46:56 UTC (rev 16283)
@@ -672,8 +672,8 @@
return -1;
}
- d_printf("%s\\%s has %d members\n", groupdomain, groupname,
- num_members);
+ d_printf("%s\\%s has %u members\n", groupdomain, groupname,
+ (unsigned int)num_members);
for (i=0; i<num_members; i++) {
const char *dom, *name;
if (lookup_sid(tmp_talloc_ctx(), &members[i],
More information about the samba-cvs
mailing list