mirror of
https://github.com/RsyncProject/rsync.git
synced 2026-01-26 07:48:18 -05:00
Use who_am_i() to qualify some debug messages.
This commit is contained in:
11
exclude.c
11
exclude.c
@@ -102,7 +102,7 @@ void free_exclude_list(struct exclude_struct ***listp)
|
||||
struct exclude_struct **list = *listp;
|
||||
|
||||
if (verbose > 2)
|
||||
rprintf(FINFO,"clearing exclude list\n");
|
||||
rprintf(FINFO, "[%s] clearing exclude list\n", who_am_i());
|
||||
|
||||
if (!list)
|
||||
return;
|
||||
@@ -203,12 +203,14 @@ static void report_exclude_result(char const *name,
|
||||
* then it is stripped out by make_exclude. So as a special
|
||||
* case we add it back in here. */
|
||||
|
||||
if (verbose >= 2)
|
||||
rprintf(FINFO, "%s %s %s because of pattern %s%s\n",
|
||||
if (verbose >= 2) {
|
||||
rprintf(FINFO, "[%s] %s %s %s because of pattern %s%s\n",
|
||||
who_am_i(),
|
||||
ent->include ? "including" : "excluding",
|
||||
name_is_dir ? "directory" : "file",
|
||||
name, ent->pattern,
|
||||
ent->directory ? "/" : "");
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -250,7 +252,8 @@ void add_exclude(struct exclude_struct ***listp, const char *pattern, int includ
|
||||
out_of_memory("add_exclude");
|
||||
|
||||
if (verbose > 2) {
|
||||
rprintf(FINFO,"add_exclude(%s,%s)\n",pattern,
|
||||
rprintf(FINFO, "[%s] add_exclude(%s,%s)\n",
|
||||
who_am_i(), pattern,
|
||||
include ? "include" : "exclude");
|
||||
}
|
||||
|
||||
|
||||
13
flist.c
13
flist.c
@@ -342,7 +342,8 @@ static void flist_expand(struct file_list *flist)
|
||||
}
|
||||
|
||||
if (verbose >= 2) {
|
||||
rprintf(FINFO, "expand file_list to %.0f bytes, did%s move\n",
|
||||
rprintf(FINFO, "[%s] expand file_list to %.0f bytes, did%s move\n",
|
||||
who_am_i(),
|
||||
(double)sizeof(flist->files[0])
|
||||
* flist->malloced,
|
||||
(new_ptr == flist->files) ? " not" : "");
|
||||
@@ -781,8 +782,10 @@ struct file_struct *make_file(char *fname, struct string_area **ap,
|
||||
|
||||
skip_excludes:
|
||||
|
||||
if (verbose > 2)
|
||||
rprintf(FINFO, "make_file(%s,*,%d)\n", fname, exclude_level);
|
||||
if (verbose > 2) {
|
||||
rprintf(FINFO, "[%s] make_file(%s,*,%d)\n",
|
||||
who_am_i(), fname, exclude_level);
|
||||
}
|
||||
|
||||
file = new(struct file_struct);
|
||||
if (!file)
|
||||
@@ -1414,8 +1417,8 @@ static void clean_flist(struct file_list *flist, int strip_root, int no_dups)
|
||||
return;
|
||||
|
||||
for (i = 0; i < flist->count; i++) {
|
||||
rprintf(FINFO, "[%ld] i=%d %s %s %s mode=0%o len=%.0f\n",
|
||||
(long) getpid(), i,
|
||||
rprintf(FINFO, "[%s] i=%d %s %s %s mode=0%o len=%.0f\n",
|
||||
who_am_i(), i,
|
||||
NS(flist->files[i]->basedir),
|
||||
NS(flist->files[i]->dirname),
|
||||
NS(flist->files[i]->basename),
|
||||
|
||||
Reference in New Issue
Block a user