* [PATCH] for-each-ref: use skip_prefix() to avoid duplicate string comparison
@ 2015-02-21 19:51 René Scharfe
0 siblings, 0 replies; only message in thread
From: René Scharfe @ 2015-02-21 19:51 UTC (permalink / raw)
To: Git Mailing List; +Cc: Junio C Hamano
Use skip_prefix() to get the part after "color:" (if present) and only
compare it with "reset" instead of comparing the whole string again.
This gets rid of the duplicate "color:" part of the string constant.
Signed-off-by: Rene Scharfe <l.s.r@web•de>
---
builtin/for-each-ref.c | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/builtin/for-each-ref.c b/builtin/for-each-ref.c
index 19be78a..83f9cf9 100644
--- a/builtin/for-each-ref.c
+++ b/builtin/for-each-ref.c
@@ -178,11 +178,10 @@ static const char *find_next(const char *cp)
static int verify_format(const char *format)
{
const char *cp, *sp;
- static const char color_reset[] = "color:reset";
need_color_reset_at_eol = 0;
for (cp = format; *cp && (sp = find_next(cp)); ) {
- const char *ep = strchr(sp, ')');
+ const char *color, *ep = strchr(sp, ')');
int at;
if (!ep)
@@ -191,8 +190,8 @@ static int verify_format(const char *format)
at = parse_atom(sp + 2, ep);
cp = ep + 1;
- if (starts_with(used_atom[at], "color:"))
- need_color_reset_at_eol = !!strcmp(used_atom[at], color_reset);
+ if (skip_prefix(used_atom[at], "color:", &color))
+ need_color_reset_at_eol = !!strcmp(color, "reset");
}
return 0;
}
--
2.3.0
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2015-02-21 19:52 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-02-21 19:51 [PATCH] for-each-ref: use skip_prefix() to avoid duplicate string comparison René Scharfe
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox