Handle the extra output needed when log_format_has_i > 1.

[rsync/rsync.git] / log.c

diff --git a/log.c b/log.c
index 52e3dac..a1df72d 100644 (file)
--- a/log.c
+++ b/log.c
@@ -84,7 +84,6 @@ struct {
 };
 
 
-
 /*
  * Map from rsync error code to name, or return NULL.
  */
@@ -98,7 +97,6 @@ static char const *rerr_name(int code)
        return NULL;
 }
 
-
 static void logit(int priority, char *buf)
 {
        if (logfile_was_closed)
@@ -294,7 +292,6 @@ void rwrite(enum logcode code, char *buf, int len)
        }
 }
 
-
 /* This is the rsync debugging function. Call it with FINFO, FERROR or
  * FLOG. */
 void rprintf(enum logcode code, const char *format, ...)
@@ -336,7 +333,6 @@ void rprintf(enum logcode code, const char *format, ...)
        rwrite(code, buf, len);
 }
 
-
 /* This is like rprintf, but it also tries to print some
  * representation of the error code.  Normally errcode = errno.
  *
@@ -368,8 +364,6 @@ void rsyserr(enum logcode code, int errcode, const char *format, ...)
        rwrite(code, buf, len);
 }
 
-
-
 void rflush(enum logcode code)
 {
        FILE *f = NULL;
@@ -397,8 +391,6 @@ void rflush(enum logcode code)
        fflush(f);
 }
 
-
-
 /* a generic logging routine for send/recv, with parameter
  * substitiution */
 static void log_formatted(enum logcode code, char *format, char *op,
@@ -654,7 +646,7 @@ void maybe_log_item(struct file_struct *file, int iflags, int itemizing,
 {
        int significant_flags = iflags & SIGNIFICANT_ITEM_FLAGS;
        int see_item = itemizing && (significant_flags || *buf
-                                 || (verbose > 1 && log_format_has_i));
+               || log_format_has_i > 1 || (verbose > 1 && log_format_has_i));
        int local_change = iflags & ITEM_LOCAL_CHANGE && significant_flags;
        if (am_server) {
                if (am_daemon && !dry_run && see_item)
@@ -692,7 +684,6 @@ void log_delete(char *fname, int mode)
        log_formatted(FLOG, fmt, "del.", &file, &stats, ITEM_DELETED, NULL);
 }
 
-
 /*
  * Called when the transfer is interrupted for some reason.
  *