summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2006-06-16 01:47:02 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 11:17:31 -0500
commit300acb99ad9fcd4a36998d4ee4d8349478deca59 (patch)
tree4dd412e9f6a578c879e539c5a96877f662358b64 /source3
parentc115570b857cff15c929cf80ad3c8f32272818d5 (diff)
downloadsamba-300acb99ad9fcd4a36998d4ee4d8349478deca59.tar.gz
samba-300acb99ad9fcd4a36998d4ee4d8349478deca59.tar.bz2
samba-300acb99ad9fcd4a36998d4ee4d8349478deca59.zip
r16284: Start fixing up gcc4 -O6 warnings on an x86_64 box. size_t != unsigned
int in a format string. Jeremy. (This used to be commit face01ef01e1a3c96eae17c56cadf01020d4cb46)
Diffstat (limited to 'source3')
-rw-r--r--source3/nsswitch/winbindd_cache.c4
-rw-r--r--source3/nsswitch/winbindd_group.c8
-rw-r--r--source3/smbd/notify_fam.c2
-rw-r--r--source3/utils/net_ads.c4
-rw-r--r--source3/utils/net_rpc.c4
-rw-r--r--source3/utils/net_sam.c4
6 files changed, 13 insertions, 13 deletions
diff --git a/source3/nsswitch/winbindd_cache.c b/source3/nsswitch/winbindd_cache.c
index 86846f7835..ba69d41392 100644
--- a/source3/nsswitch/winbindd_cache.c
+++ b/source3/nsswitch/winbindd_cache.c
@@ -229,8 +229,8 @@ static time_t centry_time(struct cache_entry *centry)
{
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 ? */
diff --git a/source3/nsswitch/winbindd_group.c b/source3/nsswitch/winbindd_group.c
index 5caaa7aa3a..c0da45d8d0 100644
--- a/source3/nsswitch/winbindd_group.c
+++ b/source3/nsswitch/winbindd_group.c
@@ -184,8 +184,8 @@ static BOOL fill_grent_mem(struct winbindd_domain *domain,
*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 @@ void winbindd_getgrent(struct winbindd_cli_state *state)
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);
diff --git a/source3/smbd/notify_fam.c b/source3/smbd/notify_fam.c
index 3b6be77aca..b7f9a36332 100644
--- a/source3/smbd/notify_fam.c
+++ b/source3/smbd/notify_fam.c
@@ -371,7 +371,7 @@ fam_register_notify(connection_struct * conn,
}
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);
}
diff --git a/source3/utils/net_ads.c b/source3/utils/net_ads.c
index 0393644494..fabf36e252 100644
--- a/source3/utils/net_ads.c
+++ b/source3/utils/net_ads.c
@@ -863,8 +863,8 @@ static int check_ads_config( void )
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;
}
diff --git a/source3/utils/net_rpc.c b/source3/utils/net_rpc.c
index 0844d407db..cf9f953458 100644
--- a/source3/utils/net_rpc.c
+++ b/source3/utils/net_rpc.c
@@ -396,8 +396,8 @@ int net_rpc_join(int argc, const char **argv)
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;
}
diff --git a/source3/utils/net_sam.c b/source3/utils/net_sam.c
index 0bf662c271..605d4bbc6b 100644
--- a/source3/utils/net_sam.c
+++ b/source3/utils/net_sam.c
@@ -672,8 +672,8 @@ static int net_sam_listmem(int argc, const char **argv)
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],