Changed human_num() to big_num() with an extra arg so that it can

[rsync.git] / match.c

diff --git a/match.c b/match.c
index 280e09fcaa588bc1722a736ead2e7abf7b69effd..a3659fc642c5e41c9d624036f0f17c94342da5d7 100644 (file)
--- a/match.c
+++ b/match.c
@@ -21,8 +21,6 @@
 
 #include "rsync.h"
 
-extern int verbose;
-extern int do_progress;
 extern int checksum_seed;
 extern int append_mode;
 
@@ -108,10 +106,10 @@ static void matched(int f, struct sum_struct *s, struct map_struct *buf,
        int32 n = (int32)(offset - last_match); /* max value: block_size (int32) */
        int32 j;
 
-       if (verbose > 2 && i >= 0) {
+       if (DEBUG_GTE(CHKSUM, 2) && i >= 0) {
                rprintf(FINFO,
-                       "match at %.0f last_match=%.0f j=%d len=%ld n=%ld\n",
-                       (double)offset, (double)last_match, i,
+                       "match at %s last_match=%s j=%d len=%ld n=%ld\n",
+                       big_num(offset, 0), big_num(last_match, 0), i,
                        (long)s->sums[i].len, (long)n);
        }
 
@@ -133,7 +131,7 @@ static void matched(int f, struct sum_struct *s, struct map_struct *buf,
        else
                last_match = offset;
 
-       if (buf && do_progress)
+       if (buf && INFO_GTE(PROGRESS, 1))
                show_progress(last_match, buf->file_size);
 }
 
@@ -152,9 +150,9 @@ static void hash_search(int f,struct sum_struct *s,
         * coding of the output to work more efficiently. */
        want_i = 0;
 
-       if (verbose > 2) {
-               rprintf(FINFO, "hash search b=%ld len=%.0f\n",
-                       (long)s->blength, (double)len);
+       if (DEBUG_GTE(CHKSUM, 2)) {
+               rprintf(FINFO, "hash search b=%ld len=%s\n",
+                       (long)s->blength, big_num(len, 0));
        }
 
        k = (int32)MIN(len, (OFF_T)s->blength);
@@ -164,25 +162,25 @@ static void hash_search(int f,struct sum_struct *s,
        sum = get_checksum1((char *)map, k);
        s1 = sum & 0xFFFF;
        s2 = sum >> 16;
-       if (verbose > 3)
+       if (DEBUG_GTE(CHKSUM, 3))
                rprintf(FINFO, "sum=%.8x k=%ld\n", sum, (long)k);
 
        offset = 0;
 
        end = len + 1 - s->sums[s->count-1].len;
 
-       if (verbose > 3) {
-               rprintf(FINFO, "hash search s->blength=%ld len=%.0f count=%.0f\n",
-                       (long)s->blength, (double)len, (double)s->count);
+       if (DEBUG_GTE(CHKSUM, 3)) {
+               rprintf(FINFO, "hash search s->blength=%ld len=%s count=%s\n",
+                       (long)s->blength, big_num(len, 0), big_num(s->count, 0));
        }
 
        do {
                int done_csum2 = 0;
                int32 i;
 
-               if (verbose > 4) {
-                       rprintf(FINFO, "offset=%.0f sum=%04x%04x\n",
-                               (double)offset, s2 & 0xFFFF, s1 & 0xFFFF);
+               if (DEBUG_GTE(CHKSUM, 4)) {
+                       rprintf(FINFO, "offset=%s sum=%04x%04x\n",
+                               big_num(offset, 0), s2 & 0xFFFF, s1 & 0xFFFF);
                }
 
                if (tablesize == TRADITIONAL_TABLESIZE) {
@@ -213,10 +211,10 @@ static void hash_search(int f,struct sum_struct *s,
                            && !(s->sums[i].flags & SUMFLG_SAME_OFFSET))
                                continue;
 
-                       if (verbose > 3) {
+                       if (DEBUG_GTE(CHKSUM, 3)) {
                                rprintf(FINFO,
-                                       "potential match at %.0f i=%ld sum=%08x\n",
-                                       (double)offset, (long)i, sum);
+                                       "potential match at %s i=%ld sum=%08x\n",
+                                       big_num(offset, 0), (long)i, sum);
                        }
 
                        if (!done_csum2) {
@@ -344,7 +342,7 @@ void match_sums(int f, struct sum_struct *s, struct map_struct *buf, OFF_T len)
                if (append_mode == 2) {
                        OFF_T j = 0;
                        for (j = CHUNK_SIZE; j < s->flength; j += CHUNK_SIZE) {
-                               if (buf && do_progress)
+                               if (buf && INFO_GTE(PROGRESS, 1))
                                        show_progress(last_match, buf->file_size);
                                sum_update(map_ptr(buf, last_match, CHUNK_SIZE),
                                           CHUNK_SIZE);
@@ -352,7 +350,7 @@ void match_sums(int f, struct sum_struct *s, struct map_struct *buf, OFF_T len)
                        }
                        if (last_match < s->flength) {
                                int32 n = (int32)(s->flength - last_match);
-                               if (buf && do_progress)
+                               if (buf && INFO_GTE(PROGRESS, 1))
                                        show_progress(last_match, buf->file_size);
                                sum_update(map_ptr(buf, last_match, n), n);
                        }
@@ -364,12 +362,12 @@ void match_sums(int f, struct sum_struct *s, struct map_struct *buf, OFF_T len)
        if (len > 0 && s->count > 0) {
                build_hash_table(s);
 
-               if (verbose > 2)
+               if (DEBUG_GTE(CHKSUM, 2))
                        rprintf(FINFO,"built hash table\n");
 
                hash_search(f, s, buf, len);
 
-               if (verbose > 2)
+               if (DEBUG_GTE(CHKSUM, 2))
                        rprintf(FINFO,"done hash search\n");
        } else {
                OFF_T j;
@@ -384,11 +382,11 @@ void match_sums(int f, struct sum_struct *s, struct map_struct *buf, OFF_T len)
        if (buf && buf->status != 0)
                file_sum[0]++;
 
-       if (verbose > 2)
+       if (DEBUG_GTE(CHKSUM, 2))
                rprintf(FINFO,"sending file_sum\n");
        write_buf(f, file_sum, sum_len);
 
-       if (verbose > 2)
+       if (DEBUG_GTE(CHKSUM, 2))
                rprintf(FINFO, "false_alarms=%d hash_hits=%d matches=%d\n",
                        false_alarms, hash_hits, matches);
 
@@ -400,11 +398,11 @@ void match_sums(int f, struct sum_struct *s, struct map_struct *buf, OFF_T len)
 
 void match_report(void)
 {
-       if (verbose <= 1)
+       if (!DEBUG_GTE(CHKSUM, 1))
                return;
 
        rprintf(FINFO,
-               "total: matches=%d  hash_hits=%d  false_alarms=%d data=%.0f\n",
+               "total: matches=%d  hash_hits=%d  false_alarms=%d data=%s\n",
                total_matches, total_hash_hits, total_false_alarms,
-               (double)stats.literal_data);
+               big_num(stats.literal_data, 0));
 }