gitweb: Better git-unquoting and gitweb-quoting of pathnames

diff --git a/blame.c b/blame.c
index e664813cb48f555fa8968995eda4170a02a99f42..1144c8533724b06534caad7f693bdb65df496682 100644 (file)
--- a/blame.c
+++ b/blame.c
@@ -19,7 +19,9 @@
 #include "xdiff-interface.h"
 #include "quote.h"
 
+#ifndef DEBUG
 #define DEBUG 0
+#endif
 
 static const char blame_usage[] =
 "git-blame [-c] [-l] [-t] [-f] [-n] [-p] [-S <revs-file>] [--] file [commit]\n"
@@ -65,6 +67,7 @@ static void get_blob(struct commit *commit);
 static int num_get_patch;
 static int num_commits;
 static int patch_time;
+static int num_read_blob;
 
 struct blame_diff_state {
        struct xdiff_emit_state xm;
@@ -204,6 +207,7 @@ static void get_blob(struct commit *commit)
                return;
 
        info->buf = read_sha1_file(info->sha1, type, &info->size);
+       num_read_blob++;
 
        assert(!strcmp(type, blob_type));
 }
@@ -232,6 +236,9 @@ static void print_map(struct commit *cmit, struct commit *other)
            util2->num_lines ? util->num_lines : util2->num_lines;
        int num;
 
+       if (print_map == NULL)
+               ; /* to avoid "unused function" warning */
+
        for (i = 0; i < max; i++) {
                printf("i: %d ", i);
                num = -1;
@@ -1071,6 +1078,7 @@ int main(int argc, const char **argv)
        }
 
        if (DEBUG) {
+               printf("num read blob: %d\n", num_read_blob);
                printf("num get patch: %d\n", num_get_patch);
                printf("num commits: %d\n", num_commits);
                printf("patch time: %f\n", patch_time / 1000000.0);