@matheusbsbs / matheus-bagliano / commits / 2608c24940

log-tree: make name_decoration hash static

In the previous commit, we made add_name_decoration global so that adders would not have to access the hash directly. We now make the hash itself static so that callers _have_ to add through our function, making sure that all additions go through a single point. To do this, we have to add one more accessor function: a way to lookup entries in the hash. Since the only caller doesn't actually look at the returned value, but rather only asks whether there is a decoration or not, we could provide only a boolean "has_name_decoration". That would allow us to make "struct name_decoration" local to log-tree, as well. However, it's unlikely to cause any maintainability harm making the actual data public, and this interface is more flexible if we need to look at decorations from other parts of the code in the future. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Jeff King committed Aug 26, 2014 at 06:23 UTC 2608c24940c80bf379937e4cefee75e2db79e008

3 files changed +10 -5

commit.h

+1 -1

@@ -27,7 +27,6 @@ extern int save_commit_buffer;

27 extern const char *commit_type;

29 /* While we can decorate any object with a name, it's only used for commits.. */

30 -extern struct decoration name_decoration;

30 struct name_decoration {

31 struct name_decoration *next;

32 int type;

@@ -45,6 +44,7 @@ enum decoration_type {

44 };

46 void add_name_decoration(enum decoration_type type, const char *name, struct object *obj);

47 +const struct name_decoration *get_name_decoration(const struct object *obj);

49 struct commit *lookup_commit(const unsigned char *sha1);

50 struct commit *lookup_commit_reference(const unsigned char *sha1);

log-tree.c

+8 -3

@@ -12,7 +12,7 @@

12 #include "sequencer.h"

13 #include "line-log.h"

15 -struct decoration name_decoration = { "object names" };

15 +static struct decoration name_decoration = { "object names" };

17 static char decoration_colors[][COLOR_MAXLEN] = {

18 GIT_COLOR_RESET,

@@ -83,6 +83,11 @@ void add_name_decoration(enum decoration_type type, const char *name, struct obj

83 res->next = add_decoration(&name_decoration, obj, res);

84 }

86 +const struct name_decoration *get_name_decoration(const struct object *obj)

87 +{

88 + return lookup_decoration(&name_decoration, obj);

89 +}

90 +

91 static int add_ref_decoration(const char *refname, const unsigned char *sha1, int flags, void *cb_data)

92 {

93 struct object *obj;

@@ -177,13 +182,13 @@ void format_decorations(struct strbuf *sb,

182 int use_color)

183 {

184 const char *prefix;

180 - struct name_decoration *decoration;

185 + const struct name_decoration *decoration;

186 const char *color_commit =

187 diff_get_color(use_color, DIFF_COMMIT);

188 const char *color_reset =

189 decorate_get_color(use_color, DECORATION_NONE);

190

186 - decoration = lookup_decoration(&name_decoration, &commit->object);

191 + decoration = get_name_decoration(&commit->object);

192 if (!decoration)

193 return;

194 prefix = " (";

revision.c

+1 -1

@@ -473,7 +473,7 @@ static int rev_compare_tree(struct rev_info *revs,

473 * If we are simplifying by decoration, then the commit

474 * is worth showing if it has a tag pointing at it.

475 */

476 - if (lookup_decoration(&name_decoration, &commit->object))

476 + if (get_name_decoration(&commit->object))

477 return REV_TREE_DIFFERENT;

478 /*

479 * A commit that is not pointed by a tag is uninteresting