diff options
author | Gerald Carter <jerry@samba.org> | 2004-12-23 18:45:36 +0000 |
---|---|---|
committer | Gerald Carter <jerry@samba.org> | 2004-12-23 18:45:36 +0000 |
commit | b262548fec09659f46839dcf4c079176775f0871 (patch) | |
tree | 2f44f7f1cdce6d71d868626caea49fdfb82e1249 /source/libsmb/libsmbclient.c | |
parent | 8d91e07ef22ad3ed484b04bc4968380a24940696 (diff) | |
download | samba-b262548fec09659f46839dcf4c079176775f0871.tar.gz samba-b262548fec09659f46839dcf4c079176775f0871.tar.xz samba-b262548fec09659f46839dcf4c079176775f0871.zip |
r4348: syncing up for 3.0.11pre1
Diffstat (limited to 'source/libsmb/libsmbclient.c')
-rw-r--r-- | source/libsmb/libsmbclient.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source/libsmb/libsmbclient.c b/source/libsmb/libsmbclient.c index 1e702d73138..df9c4ddcadc 100644 --- a/source/libsmb/libsmbclient.c +++ b/source/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); |