Commit ea847c62 authored by Wayne Davison's avatar Wayne Davison

Use who_am_i() to qualify some debug messages.

parent b695f242
...@@ -102,7 +102,7 @@ void free_exclude_list(struct exclude_struct ***listp) ...@@ -102,7 +102,7 @@ void free_exclude_list(struct exclude_struct ***listp)
struct exclude_struct **list = *listp; struct exclude_struct **list = *listp;
if (verbose > 2) if (verbose > 2)
rprintf(FINFO,"clearing exclude list\n"); rprintf(FINFO, "[%s] clearing exclude list\n", who_am_i());
if (!list) if (!list)
return; return;
...@@ -203,12 +203,14 @@ static void report_exclude_result(char const *name, ...@@ -203,12 +203,14 @@ static void report_exclude_result(char const *name,
* then it is stripped out by make_exclude. So as a special * then it is stripped out by make_exclude. So as a special
* case we add it back in here. */ * case we add it back in here. */
if (verbose >= 2) if (verbose >= 2) {
rprintf(FINFO, "%s %s %s because of pattern %s%s\n", rprintf(FINFO, "[%s] %s %s %s because of pattern %s%s\n",
who_am_i(),
ent->include ? "including" : "excluding", ent->include ? "including" : "excluding",
name_is_dir ? "directory" : "file", name_is_dir ? "directory" : "file",
name, ent->pattern, name, ent->pattern,
ent->directory ? "/" : ""); ent->directory ? "/" : "");
}
} }
...@@ -250,7 +252,8 @@ void add_exclude(struct exclude_struct ***listp, const char *pattern, int includ ...@@ -250,7 +252,8 @@ void add_exclude(struct exclude_struct ***listp, const char *pattern, int includ
out_of_memory("add_exclude"); out_of_memory("add_exclude");
if (verbose > 2) { 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"); include ? "include" : "exclude");
} }
......
...@@ -342,7 +342,8 @@ static void flist_expand(struct file_list *flist) ...@@ -342,7 +342,8 @@ static void flist_expand(struct file_list *flist)
} }
if (verbose >= 2) { 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]) (double)sizeof(flist->files[0])
* flist->malloced, * flist->malloced,
(new_ptr == flist->files) ? " not" : ""); (new_ptr == flist->files) ? " not" : "");
...@@ -781,8 +782,10 @@ struct file_struct *make_file(char *fname, struct string_area **ap, ...@@ -781,8 +782,10 @@ struct file_struct *make_file(char *fname, struct string_area **ap,
skip_excludes: skip_excludes:
if (verbose > 2) if (verbose > 2) {
rprintf(FINFO, "make_file(%s,*,%d)\n", fname, exclude_level); rprintf(FINFO, "[%s] make_file(%s,*,%d)\n",
who_am_i(), fname, exclude_level);
}
file = new(struct file_struct); file = new(struct file_struct);
if (!file) if (!file)
...@@ -1414,8 +1417,8 @@ static void clean_flist(struct file_list *flist, int strip_root, int no_dups) ...@@ -1414,8 +1417,8 @@ static void clean_flist(struct file_list *flist, int strip_root, int no_dups)
return; return;
for (i = 0; i < flist->count; i++) { for (i = 0; i < flist->count; i++) {
rprintf(FINFO, "[%ld] i=%d %s %s %s mode=0%o len=%.0f\n", rprintf(FINFO, "[%s] i=%d %s %s %s mode=0%o len=%.0f\n",
(long) getpid(), i, who_am_i(), i,
NS(flist->files[i]->basedir), NS(flist->files[i]->basedir),
NS(flist->files[i]->dirname), NS(flist->files[i]->dirname),
NS(flist->files[i]->basename), NS(flist->files[i]->basename),
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment