From: Wayne Davison <wayned@samba.org>
Date: Tue, 27 Jan 2004 23:13:15 +0000 (+0000)
Subject: Use who_am_i() to qualify some debug messages.
X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/commitdiff_plain/ea847c623231ebbf9cceabe855ae0b40780f9040

Use who_am_i() to qualify some debug messages.
---

diff --git a/exclude.c b/exclude.c
index 702a52ec..ee8016fd 100644
--- a/exclude.c
+++ b/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");
 	}
 
diff --git a/flist.c b/flist.c
index 263af260..ee18d4d9 100644
--- a/flist.c
+++ b/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),