summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWayne Davison <wayned@samba.org>2004-04-22 09:58:18 +0000
committerWayne Davison <wayned@samba.org>2004-04-22 09:58:18 +0000
commit8ef81dd45257e27275baff9421af8d78b64b6752 (patch)
treebdb53daf6c1d0f0acdf426e76a6f9a917d587a49
parent67340e95238ad48202977210389bb7a54e65bbe3 (diff)
downloadrsync-8ef81dd45257e27275baff9421af8d78b64b6752.tar.gz
No need to pass a debug string to check_exclude() anymore. When we
free an exclude list, make sure we don't clear the debug_type string.
-rw-r--r--flist.c11
1 files changed, 4 insertions, 7 deletions
diff --git a/flist.c b/flist.c
index 57355365..077e42c7 100644
--- a/flist.c
+++ b/flist.c
@@ -227,17 +227,14 @@ static int check_exclude_file(char *fname, int is_dir, int exclude_level)
}
}
if (server_exclude_list.head
- && check_exclude(&server_exclude_list, fname, is_dir,
- "server pattern"))
+ && check_exclude(&server_exclude_list, fname, is_dir))
return 1;
if (exclude_level != ALL_EXCLUDES)
return 0;
- if (exclude_list.head
- && check_exclude(&exclude_list, fname, is_dir, "pattern"))
+ if (exclude_list.head && check_exclude(&exclude_list, fname, is_dir))
return 1;
if (local_exclude_list.head
- && check_exclude(&local_exclude_list, fname, is_dir,
- "local-cvsignore"))
+ && check_exclude(&local_exclude_list, fname, is_dir))
return 1;
return 0;
}
@@ -947,7 +944,7 @@ void send_file_name(int f, struct file_list *flist, char *fname,
if (recursive && S_ISDIR(file->mode)
&& !(file->flags & FLAG_MOUNT_POINT)) {
struct exclude_list_struct last_list = local_exclude_list;
- memset(&local_exclude_list, 0, sizeof local_exclude_list);
+ local_exclude_list.head = local_exclude_list.tail = NULL;
send_directory(f, flist, f_name_to(file, fbuf));
free_exclude_list(&local_exclude_list);
local_exclude_list = last_list;