mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'rs/simple-cleanups'

Browse Source 
Code cleanups.

* rs/simple-cleanups:
  sha1_name: use strlcpy() to copy strings
  pretty: use starts_with() to check for a prefix
  for-each-ref: use skip_prefix() to avoid duplicate string comparison
  connect: use strcmp() for string comparison
This commit is contained in:
Junio C Hamano
2015-03-05 12:45:42 -08:00
parent ca704731b1 2ce63e9fac
commit 8a6444d50e
4 changed files with 7 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
builtin/for-each-ref.c
View File

@ -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;
}