diff options
| author | Jeremy Allison <jra@samba.org> | 2004-11-24 01:03:23 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 10:53:25 -0500 |
| commit | 90a18110e9c014ff33977be4656886b093c7e022 (patch) | |
| tree | 25d41c526fa7235abc96c50fc11afba12dff0b81 /source3/libsmb/libsmbclient.c | |
| parent | b321a8a9ad5d2b8e276c97a4a057c5fbef8b5ff7 (diff) | |
| download | samba-90a18110e9c014ff33977be4656886b093c7e022.tar.gz samba-90a18110e9c014ff33977be4656886b093c7e022.tar.bz2 samba-90a18110e9c014ff33977be4656886b093c7e022.zip | |
r3931: Fix all "may be used uninitialized" and "shadow" warnings.
Jeremy.
(This used to be commit 8e979772a640bb4f00f4d72b6a9c837b8ef14333)
Diffstat (limited to 'source3/libsmb/libsmbclient.c')
| -rw-r--r-- | source3/libsmb/libsmbclient.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source3/libsmb/libsmbclient.c b/source3/libsmb/libsmbclient.c index 2b0115eaaa..3dec0c92b4 100644 --- a/source3/libsmb/libsmbclient.c +++ b/source3/libsmb/libsmbclient.c @@ -1697,7 +1697,7 @@ list_unique_wg_fn(const char *name, uint32 type, const char *comment, void *stat struct smbc_dir_list *dir_list; struct smbc_dirent *dirent; int dirent_type; - int remove = 0; + int do_remove = 0; dirent_type = dir->dir_type; @@ -1714,13 +1714,13 @@ list_unique_wg_fn(const char *name, uint32 type, const char *comment, void *stat for (dir_list = dir->dir_list; dir_list != dir->dir_end; dir_list = dir_list->next) { - if (! remove && + if (! do_remove && strcmp(dir_list->dirent->name, dirent->name) == 0) { /* Duplicate. End end of list need to be removed. */ - remove = 1; + do_remove = 1; } - if (remove && dir_list->next == dir->dir_end) { + if (do_remove && dir_list->next == dir->dir_end) { /* Found the end of the list. Remove it. */ dir->dir_end = dir_list; free(dir_list->next); |