cache-tree/blame: avoid reusing the DEBUG constant

In MS Visual C, the `DEBUG` constant is set automatically whenever
compiling with debug information.

This is clearly not what was intended in `cache-tree.c` nor in
`builtin/blame.c`, so let's use a less ambiguous name there.

Signed-off-by: Jeff Hostetler <jeffhost@microsoft.com>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/builtin/blame.c b/builtin/blame.c
index 21cde57e711e337f3c123b35332bb2af0ebdf9cf..50e3d4a2656140b406975947d066283a2ef14460 100644 (file)
--- a/builtin/blame.c
+++ b/builtin/blame.c
@@ -59,8 +59,8 @@ static size_t blame_date_width;
 
 static struct string_list mailmap = STRING_LIST_INIT_NODUP;
 
 
 static struct string_list mailmap = STRING_LIST_INIT_NODUP;
 

-#ifndef DEBUG
-#define DEBUG 0
+#ifndef DEBUG_BLAME
+#define DEBUG_BLAME 0

 #endif
 
 static unsigned blame_move_score;
 #endif
 
 static unsigned blame_move_score;


@@ -1062,7 +1062,7 @@ int cmd_blame(int argc, const char **argv, const char *prefix)
        if (blame_copy_score)
                sb.copy_score = blame_copy_score;
 
        if (blame_copy_score)
                sb.copy_score = blame_copy_score;
 

-       sb.debug = DEBUG;
+       sb.debug = DEBUG_BLAME;

        sb.on_sanity_fail = &sanity_check_on_fail;
 
        sb.show_root = show_root;
        sb.on_sanity_fail = &sanity_check_on_fail;
 
        sb.show_root = show_root;

diff --git a/cache-tree.c b/cache-tree.c
index b13bfaf71e9e1554173beca4cfd8acf5929bc9ce..706ffcf1883a01d1ac6f3e966f9d10ebc2e1d8dd 100644 (file)
--- a/cache-tree.c
+++ b/cache-tree.c
@@ -6,8 +6,8 @@
 #include "object-store.h"
 #include "replace-object.h"
 
 #include "object-store.h"
 #include "replace-object.h"
 

-#ifndef DEBUG
-#define DEBUG 0
+#ifndef DEBUG_CACHE_TREE
+#define DEBUG_CACHE_TREE 0

 #endif
 
 struct cache_tree *cache_tree(void)
 #endif
 
 struct cache_tree *cache_tree(void)


@@ -111,7 +111,7 @@ static int do_invalidate_path(struct cache_tree *it, const char *path)
        int namelen;
        struct cache_tree_sub *down;
 
        int namelen;
        struct cache_tree_sub *down;
 

-#if DEBUG
+#if DEBUG_CACHE_TREE

        fprintf(stderr, "cache-tree invalidate <%s>\n", path);
 #endif
 
        fprintf(stderr, "cache-tree invalidate <%s>\n", path);
 #endif
 


@@ -398,7 +398,7 @@ static int update_one(struct cache_tree *it,
                strbuf_addf(&buffer, "%o %.*s%c", mode, entlen, path + baselen, '\0');
                strbuf_add(&buffer, oid->hash, the_hash_algo->rawsz);
 
                strbuf_addf(&buffer, "%o %.*s%c", mode, entlen, path + baselen, '\0');
                strbuf_add(&buffer, oid->hash, the_hash_algo->rawsz);
 

-#if DEBUG
+#if DEBUG_CACHE_TREE

                fprintf(stderr, "cache-tree update-one %o %.*s\n",
                        mode, entlen, path + baselen);
 #endif
                fprintf(stderr, "cache-tree update-one %o %.*s\n",
                        mode, entlen, path + baselen);
 #endif


@@ -421,7 +421,7 @@ static int update_one(struct cache_tree *it,
 
        strbuf_release(&buffer);
        it->entry_count = to_invalidate ? -1 : i - *skip_count;
 
        strbuf_release(&buffer);
        it->entry_count = to_invalidate ? -1 : i - *skip_count;

-#if DEBUG
+#if DEBUG_CACHE_TREE

        fprintf(stderr, "cache-tree update-one (%d ent, %d subtree) %s\n",
                it->entry_count, it->subtree_nr,
                oid_to_hex(&it->oid));
        fprintf(stderr, "cache-tree update-one (%d ent, %d subtree) %s\n",
                it->entry_count, it->subtree_nr,
                oid_to_hex(&it->oid));


@@ -462,7 +462,7 @@ static void write_one(struct strbuf *buffer, struct cache_tree *it,
        strbuf_add(buffer, path, pathlen);
        strbuf_addf(buffer, "%c%d %d\n", 0, it->entry_count, it->subtree_nr);
 
        strbuf_add(buffer, path, pathlen);
        strbuf_addf(buffer, "%c%d %d\n", 0, it->entry_count, it->subtree_nr);
 

-#if DEBUG
+#if DEBUG_CACHE_TREE

        if (0 <= it->entry_count)
                fprintf(stderr, "cache-tree <%.*s> (%d ent, %d subtree) %s\n",
                        pathlen, path, it->entry_count, it->subtree_nr,
        if (0 <= it->entry_count)
                fprintf(stderr, "cache-tree <%.*s> (%d ent, %d subtree) %s\n",
                        pathlen, path, it->entry_count, it->subtree_nr,


@@ -536,7 +536,7 @@ static struct cache_tree *read_one(const char **buffer, unsigned long *size_p)
                size -= rawsz;
        }
 
                size -= rawsz;
        }
 

-#if DEBUG
+#if DEBUG_CACHE_TREE

        if (0 <= it->entry_count)
                fprintf(stderr, "cache-tree <%s> (%d ent, %d subtree) %s\n",
                        *buffer, it->entry_count, subtree_nr,
        if (0 <= it->entry_count)
                fprintf(stderr, "cache-tree <%s> (%d ent, %d subtree) %s\n",
                        *buffer, it->entry_count, subtree_nr,