diff options
author | Jeremy Allison <jra@samba.org> | 2005-10-18 03:24:00 +0000 |
---|---|---|
committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 11:05:02 -0500 |
commit | 8d7c88667190fe286971ac4fffb64ee5bd9eeeb0 (patch) | |
tree | d5b2f0850d63a07e051c03a7abe1f10884598161 /source3/lib/util.c | |
parent | afca439d19e3d9e67b127d7060df630e2218bcb2 (diff) | |
download | samba-8d7c88667190fe286971ac4fffb64ee5bd9eeeb0.tar.gz samba-8d7c88667190fe286971ac4fffb64ee5bd9eeeb0.tar.bz2 samba-8d7c88667190fe286971ac4fffb64ee5bd9eeeb0.zip |
r11137: Compile with only 2 warnings (I'm still working on that code) on a gcc4
x86_64 box.
Jeremy.
(This used to be commit d720867a788c735e56d53d63265255830ec21208)
Diffstat (limited to 'source3/lib/util.c')
-rw-r--r-- | source3/lib/util.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/source3/lib/util.c b/source3/lib/util.c index a5cfe95b66..30886b0dd8 100644 --- a/source3/lib/util.c +++ b/source3/lib/util.c @@ -282,25 +282,25 @@ const char *tmpdir(void) ****************************************************************************/ void add_gid_to_array_unique(TALLOC_CTX *mem_ctx, gid_t gid, - gid_t **gids, int *num) + gid_t **gids, size_t *num_gids) { int i; - for (i=0; i<*num; i++) { + for (i=0; i<*num_gids; i++) { if ((*gids)[i] == gid) return; } if (mem_ctx != NULL) - *gids = TALLOC_REALLOC_ARRAY(mem_ctx, *gids, gid_t, *num+1); + *gids = TALLOC_REALLOC_ARRAY(mem_ctx, *gids, gid_t, *num_gids+1); else - *gids = SMB_REALLOC_ARRAY(*gids, gid_t, *num+1); + *gids = SMB_REALLOC_ARRAY(*gids, gid_t, *num_gids+1); if (*gids == NULL) return; - (*gids)[*num] = gid; - *num += 1; + (*gids)[*num_gids] = gid; + *num_gids += 1; } /**************************************************************************** @@ -2093,7 +2093,7 @@ void dump_data_pw(const char *msg, const uchar * data, size_t len) DEBUG(11, ("%s", msg)); if (data != NULL && len > 0) { - dump_data(11, data, len); + dump_data(11, (const char *)data, len); } #endif } |