Re: [PATCH 3/3] show-branch: use skip_prefix to drop magic numbers
- From
Pranit Bauva <pranit.bauva@gmail.com>
- Date
- Feb 14, 2017, 18:53 UTC
- Message-ID
- <CAFZEwPOYGRGd5PWSfLRd6vMs35TT1ZzUSfr79fwRA4VzVjAWXA@mail.gmail.com>
- In-Reply-To
- <20170214172829.6w3cnnqy6ozxl424@sigill.intra.peff.net>
Hey Peff,
On Tue, Feb 14, 2017 at 10:58 PM, Jeff King <peff@peff.net> wrote:
Show 47 quoted lines
> 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.
>
> Signed-off-by: Jeff King <peff@peff.net>
> ---
> builtin/show-branch.c | 16 +++++++---------
> 1 file changed, 7 insertions(+), 9 deletions(-)
>
> diff --git a/builtin/show-branch.c b/builtin/show-branch.c
> index 404c4d09a..c03d3ec7c 100644
> --- a/builtin/show-branch.c
> +++ b/builtin/show-branch.c
> @@ -470,17 +470,14 @@ static void snarf_refs(int head, int remotes)
> }
> }
>
> -static int rev_is_head(char *head, char *name,
> +static int rev_is_head(const char *head, const char *name,
> unsigned char *head_sha1, unsigned char *sha1)
> {
> if (!head || (head_sha1 && sha1 && hashcmp(head_sha1, sha1)))
> return 0;
> - if (starts_with(head, "refs/heads/"))
> - head += 11;
> - if (starts_with(name, "refs/heads/"))
> - name += 11;
> - else if (starts_with(name, "heads/"))
> - name += 6;
> + skip_prefix(head, "refs/heads/", &head);
> + if (!skip_prefix(name, "refs/heads/", &name))
> + skip_prefix(name, "heads/", &name);
> return !strcmp(head, name);
> }
>
> @@ -799,8 +796,9 @@ int cmd_show_branch(int ac, const char **av, const char *prefix)
> has_head++;
> }
> if (!has_head) {
> - int offset = starts_with(head, "refs/heads/") ? 11 : 0;
> - append_one_rev(head + offset);
> + const char *name = head;
> + skip_prefix(name, "refs/heads/", &name);
> + append_one_rev(name);
> }
> }
>Did you purposely miss the one in line number 278 of builtin/show-branch.c because I think you only touched up the parts which were related to "refs/" but didn't explicitly mention it in the commit message?
if (starts_with(pretty_str, "[PATCH] "))
pretty_str += 8;If not, you can squash this patch attached. Sorry, couldn't send it in mail because of proxy issues.
Regards, Pranit Bauva
From 2e80d4458df659765011450621ee34459dc749f9 Mon Sep 17 00:00:00 2001 From: Pranit Bauva <pranit.bauva@gmail.com> Date: Tue, 14 Feb 2017 23:53:36 +0530 Subject: [PATCH] !squash: show-branch: use skip_prefix to drop magic numbers
Signed-off-by: Pranit Bauva <pranit.bauva@gmail.com> --- builtin/show-branch.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/builtin/show-branch.c b/builtin/show-branch.c index c03d3ec7c..19756595d 100644 --- a/builtin/show-branch.c +++ b/builtin/show-branch.c @@ -275,8 +275,7 @@ static void show_one_commit(struct commit *commit, int no_name) pp_commit_easy(CMIT_FMT_ONELINE, commit, &pretty); pretty_str = pretty.buf; } - if (starts_with(pretty_str, "[PATCH] ")) - pretty_str += 8; + skip_prefix(pretty_str, "[PATCH] ", &pretty_str); if (!no_name) { if (name && name->head_name) {
-- 2.11.0