show-branch: use skip_prefix to drop magic numbers
We make several starts_with() calls, only to advance pointers. This is exactly what skip_prefix() is for, which lets us avoid manually-counted magic numbers. Helped-by: Pranit Bauva <pranit.bauva@gmail.com> Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Jeff King committed
Feb 15, 2017 at 16:40 UTC
d3cc5f4c44eeacca556f9ae0972837a84e72f288
1 file changed
+8
-11
builtin/show-branch.c
+8
-11
@@ -275,8 +275,7 @@ static void show_one_commit(struct commit *commit, int no_name)
275
pp_commit_easy(CMIT_FMT_ONELINE, commit, &pretty);
276
pretty_str = pretty.buf;
277
}
278
- if (starts_with(pretty_str, "[PATCH] "))
279
- pretty_str += 8;
278
+ skip_prefix(pretty_str, "[PATCH] ", &pretty_str);
279
280
if (!no_name) {
281
if (name && name->head_name) {
@@ -470,17 +469,14 @@ static void snarf_refs(int head, int remotes)
469
}
470
}
471
473
-static int rev_is_head(char *head, char *name,
472
+static int rev_is_head(const char *head, const char *name,
473
unsigned char *head_sha1, unsigned char *sha1)
474
{
475
if (!head || (head_sha1 && sha1 && hashcmp(head_sha1, sha1)))
476
return 0;
478
- if (starts_with(head, "refs/heads/"))
479
- head += 11;
480
- if (starts_with(name, "refs/heads/"))
481
- name += 11;
482
- else if (starts_with(name, "heads/"))
483
- name += 6;
477
+ skip_prefix(head, "refs/heads/", &head);
478
+ if (!skip_prefix(name, "refs/heads/", &name))
479
+ skip_prefix(name, "heads/", &name);
480
return !strcmp(head, name);
481
}
482
@@ -799,8 +795,9 @@ int cmd_show_branch(int ac, const char **av, const char *prefix)
795
has_head++;
796
}
797
if (!has_head) {
802
- int offset = starts_with(head, "refs/heads/") ? 11 : 0;
803
- append_one_rev(head + offset);
798
+ const char *name = head;
799
+ skip_prefix(name, "refs/heads/", &name);
800
+ append_one_rev(name);
801
}
802
}
803