ref-filter: move need_color_reset_at_eol into ref_format
Calling verify_ref_format() doesn't just confirm that the format is sane; it actually sets some global variables that will be used later when formatting the refs. These logically should belong to the ref_format, which would make it possible to use multiple formats within a single program invocation. Let's move one such flag into the ref_format struct. There are still others that would need to be moved before it would be safe to use multiple formats, but this commit gives a blueprint for how that should look. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Jeff King committed
Jul 13, 2017 at 11:02 UTC
bf285ae6dbfa8e2b847940e6ad987ff3cbe40712
2 files changed
+6
-4
ref-filter.c
+3
-4
@@ -97,7 +97,6 @@ static struct used_atom {
97
} u;
98
} *used_atom;
99
static int used_atom_cnt, need_tagged, need_symref;
100
-static int need_color_reset_at_eol;
100
101
static void color_atom_parser(struct used_atom *atom, const char *color_value)
102
{
@@ -661,7 +660,7 @@ int verify_ref_format(struct ref_format *format)
660
{
661
const char *cp, *sp;
662
664
- need_color_reset_at_eol = 0;
663
+ format->need_color_reset_at_eol = 0;
664
for (cp = format->format; *cp && (sp = find_next(cp)); ) {
665
const char *color, *ep = strchr(sp, ')');
666
int at;
@@ -673,7 +672,7 @@ int verify_ref_format(struct ref_format *format)
672
cp = ep + 1;
673
674
if (skip_prefix(used_atom[at].name, "color:", &color))
676
- need_color_reset_at_eol = !!strcmp(color, "reset");
675
+ format->need_color_reset_at_eol = !!strcmp(color, "reset");
676
}
677
return 0;
678
}
@@ -2083,7 +2082,7 @@ void format_ref_array_item(struct ref_array_item *info,
2082
sp = cp + strlen(cp);
2083
append_literal(cp, sp, &state);
2084
}
2086
- if (need_color_reset_at_eol) {
2085
+ if (format->need_color_reset_at_eol) {
2086
struct atom_value resetv;
2087
resetv.s = GIT_COLOR_RESET;
2088
append_atom(&resetv, &state);
ref-filter.h
+3
@@ -79,6 +79,9 @@ struct ref_format {
79
*/
80
const char *format;
81
int quote_style;
82
+
83
+ /* Internal state to ref-filter */
84
+ int need_color_reset_at_eol;
85
};
86
87
#define REF_FORMAT_INIT { NULL, 0 }