kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

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>
maint
Jeff Hostetler 2019-06-19 14:05:58 -07:00 committed by Junio C Hamano
parent fdda1ac62d
commit e9b9cc56bb
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
builtin/blame.c
View File

@ -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 #ifndef DEBUG_BLAME
#define DEBUG 0 #define DEBUG_BLAME 0
#endif #endif


static unsigned blame_move_score; static unsigned blame_move_score;
@ -1062,7 +1062,7 @@ parse_done:
if (blame_copy_score) if (blame_copy_score)
sb.copy_score = 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.on_sanity_fail = &sanity_check_on_fail;


sb.show_root = show_root; sb.show_root = show_root;

14
cache-tree.c
View File

@ -6,8 +6,8 @@
#include "object-store.h" #include "object-store.h"
#include "replace-object.h" #include "replace-object.h"


#ifndef DEBUG #ifndef DEBUG_CACHE_TREE
#define DEBUG 0 #define DEBUG_CACHE_TREE 0
#endif #endif


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


#if DEBUG #if DEBUG_CACHE_TREE
fprintf(stderr, "cache-tree invalidate <%s>\n", path); fprintf(stderr, "cache-tree invalidate <%s>\n", path);
#endif #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_addf(&buffer, "%o %.*s%c", mode, entlen, path + baselen, '\0');
strbuf_add(&buffer, oid->hash, the_hash_algo->rawsz); strbuf_add(&buffer, oid->hash, the_hash_algo->rawsz);


#if DEBUG #if DEBUG_CACHE_TREE
fprintf(stderr, "cache-tree update-one %o %.*s\n", fprintf(stderr, "cache-tree update-one %o %.*s\n",
mode, entlen, path + baselen); mode, entlen, path + baselen);
#endif #endif
@ -421,7 +421,7 @@ static int update_one(struct cache_tree *it,


strbuf_release(&buffer); strbuf_release(&buffer);
it->entry_count = to_invalidate ? -1 : i - *skip_count; 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", fprintf(stderr, "cache-tree update-one (%d ent, %d subtree) %s\n",
it->entry_count, it->subtree_nr, it->entry_count, it->subtree_nr,
oid_to_hex(&it->oid)); 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_add(buffer, path, pathlen);
strbuf_addf(buffer, "%c%d %d\n", 0, it->entry_count, it->subtree_nr); 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) if (0 <= it->entry_count)
fprintf(stderr, "cache-tree <%.*s> (%d ent, %d subtree) %s\n", fprintf(stderr, "cache-tree <%.*s> (%d ent, %d subtree) %s\n",
pathlen, path, it->entry_count, it->subtree_nr, 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) if (0 <= it->entry_count)
fprintf(stderr, "cache-tree <%s> (%d ent, %d subtree) %s\n", fprintf(stderr, "cache-tree <%s> (%d ent, %d subtree) %s\n",
*buffer, it->entry_count, subtree_nr, *buffer, it->entry_count, subtree_nr,