use skip_prefix() to avoid more magic numbers

Continue where ae021d87 (use skip_prefix to avoid magic numbers) left off
and use skip_prefix() in more places for determining the lengths of prefix
strings to avoid using dependent constants and other indirect methods.

Signed-off-by: Rene Scharfe <l.s.r@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/builtin/apply.c b/builtin/apply.c
index 8714a887203acd84ad08f3e0917fc72b2c7a3138..97f7e8e499a69d7cb34be723a2f881365aa90347 100644 (file)
--- a/builtin/apply.c
+++ b/builtin/apply.c
@@ -435,7 +435,7 @@ static unsigned long linelen(const char *buffer, unsigned long size)
 
 static int is_dev_null(const char *str)
 {
 
 static int is_dev_null(const char *str)
 {

-       return !memcmp("/dev/null", str, 9) && isspace(str[9]);
+       return skip_prefix(str, "/dev/null", &str) && isspace(*str);

 }
 
 #define TERM_SPACE     1
 }
 
 #define TERM_SPACE     1

diff --git a/builtin/branch.c b/builtin/branch.c
index 9e4666f0c53164113ac211eee674ba838fb7ae72..67850975e7bebbf122ec961a527497c40c2c3f27 100644 (file)
--- a/builtin/branch.c
+++ b/builtin/branch.c
@@ -81,14 +81,16 @@ static int parse_branch_color_slot(const char *var, int ofs)
 
 static int git_branch_config(const char *var, const char *value, void *cb)
 {
 
 static int git_branch_config(const char *var, const char *value, void *cb)
 {

+       const char *slot_name;
+

        if (starts_with(var, "column."))
                return git_column_config(var, value, "branch", &colopts);
        if (!strcmp(var, "color.branch")) {
                branch_use_color = git_config_colorbool(var, value);
                return 0;
        }
        if (starts_with(var, "column."))
                return git_column_config(var, value, "branch", &colopts);
        if (!strcmp(var, "color.branch")) {
                branch_use_color = git_config_colorbool(var, value);
                return 0;
        }

-       if (starts_with(var, "color.branch.")) {
-               int slot = parse_branch_color_slot(var, 13);
+       if (skip_prefix(var, "color.branch.", &slot_name)) {
+               int slot = parse_branch_color_slot(var, slot_name - var);

                if (slot < 0)
                        return 0;
                if (!value)
                if (slot < 0)
                        return 0;
                if (!value)


@@ -335,20 +337,18 @@ static int append_ref(const char *refname, const unsigned char *sha1, int flags,
        static struct {
                int kind;
                const char *prefix;
        static struct {
                int kind;
                const char *prefix;

-               int pfxlen;

        } ref_kind[] = {
        } ref_kind[] = {

-               { REF_LOCAL_BRANCH, "refs/heads/", 11 },
-               { REF_REMOTE_BRANCH, "refs/remotes/", 13 },
+               { REF_LOCAL_BRANCH, "refs/heads/" },
+               { REF_REMOTE_BRANCH, "refs/remotes/" },

        };
 
        /* Detect kind */
        for (i = 0; i < ARRAY_SIZE(ref_kind); i++) {
                prefix = ref_kind[i].prefix;
        };
 
        /* Detect kind */
        for (i = 0; i < ARRAY_SIZE(ref_kind); i++) {
                prefix = ref_kind[i].prefix;

-               if (strncmp(refname, prefix, ref_kind[i].pfxlen))
-                       continue;
-               kind = ref_kind[i].kind;
-               refname += ref_kind[i].pfxlen;
-               break;
+               if (skip_prefix(refname, prefix, &refname)) {
+                       kind = ref_kind[i].kind;
+                       break;
+               }

        }
        if (ARRAY_SIZE(ref_kind) <= i)
                return 0;
        }
        if (ARRAY_SIZE(ref_kind) <= i)
                return 0;


@@ -872,13 +872,10 @@ int cmd_branch(int argc, const char **argv, const char *prefix)
        head = resolve_refdup("HEAD", head_sha1, 0, NULL);
        if (!head)
                die(_("Failed to resolve HEAD as a valid ref."));
        head = resolve_refdup("HEAD", head_sha1, 0, NULL);
        if (!head)
                die(_("Failed to resolve HEAD as a valid ref."));

-       if (!strcmp(head, "HEAD")) {
+       if (!strcmp(head, "HEAD"))

                detached = 1;
                detached = 1;

-       } else {
-               if (!starts_with(head, "refs/heads/"))
-                       die(_("HEAD not found below refs/heads!"));
-               head += 11;
-       }
+       else if (!skip_prefix(head, "refs/heads/", &head))
+               die(_("HEAD not found below refs/heads!"));

        hashcpy(merge_filter_ref, head_sha1);
 
 
        hashcpy(merge_filter_ref, head_sha1);
 
 

diff --git a/builtin/cat-file.c b/builtin/cat-file.c
index 707330499fad66a0bddbb5cf96ff0569e2fe3433..f8d81291b9913a769f79405720210aa4eaf6daee 100644 (file)
--- a/builtin/cat-file.c
+++ b/builtin/cat-file.c
@@ -82,8 +82,9 @@ static int cat_one_file(int opt, const char *exp_type, const char *obj_name)
                                enum object_type type;
                                unsigned long size;
                                char *buffer = read_sha1_file(sha1, &type, &size);
                                enum object_type type;
                                unsigned long size;
                                char *buffer = read_sha1_file(sha1, &type, &size);

-                               if (memcmp(buffer, "object ", 7) ||
-                                   get_sha1_hex(buffer + 7, blob_sha1))
+                               const char *target;
+                               if (!skip_prefix(buffer, "object ", &target) ||
+                                   get_sha1_hex(target, blob_sha1))

                                        die("%s not a valid tag", sha1_to_hex(sha1));
                                free(buffer);
                        } else
                                        die("%s not a valid tag", sha1_to_hex(sha1));
                                free(buffer);
                        } else

diff --git a/builtin/checkout.c b/builtin/checkout.c
index 8afdf2b5c4bfbd53e7315afe9d8ae3d88f93dd57..cef1996d1663fb2f5d4b910bfd1661ebe2fe042b 100644 (file)
--- a/builtin/checkout.c
+++ b/builtin/checkout.c
@@ -1150,10 +1150,8 @@ int cmd_checkout(int argc, const char **argv, const char *prefix)
                const char *argv0 = argv[0];
                if (!argc || !strcmp(argv0, "--"))
                        die (_("--track needs a branch name"));
                const char *argv0 = argv[0];
                if (!argc || !strcmp(argv0, "--"))
                        die (_("--track needs a branch name"));

-               if (starts_with(argv0, "refs/"))
-                       argv0 += 5;
-               if (starts_with(argv0, "remotes/"))
-                       argv0 += 8;
+               skip_prefix(argv0, "refs/", &argv0);
+               skip_prefix(argv0, "remotes/", &argv0);

                argv0 = strchr(argv0, '/');
                if (!argv0 || !argv0[1])
                        die (_("Missing branch name; try -b"));
                argv0 = strchr(argv0, '/');
                if (!argv0 || !argv0[1])
                        die (_("Missing branch name; try -b"));

diff --git a/builtin/clean.c b/builtin/clean.c
index 3beeea6ec0fdc3883f2456caf46f3e1c4dadc682..c35505ee6b4030eedc61861081fd21e655b2b3e4 100644 (file)
--- a/builtin/clean.c
+++ b/builtin/clean.c
@@ -100,6 +100,8 @@ static int parse_clean_color_slot(const char *var)
 
 static int git_clean_config(const char *var, const char *value, void *cb)
 {
 
 static int git_clean_config(const char *var, const char *value, void *cb)
 {

+       const char *slot_name;
+

        if (starts_with(var, "column."))
                return git_column_config(var, value, "clean", &colopts);
 
        if (starts_with(var, "column."))
                return git_column_config(var, value, "clean", &colopts);
 


@@ -109,9 +111,8 @@ static int git_clean_config(const char *var, const char *value, void *cb)
                clean_use_color = git_config_colorbool(var, value);
                return 0;
        }
                clean_use_color = git_config_colorbool(var, value);
                return 0;
        }

-       if (starts_with(var, "color.interactive.")) {
-               int slot = parse_clean_color_slot(var +
-                                                 strlen("color.interactive."));
+       if (skip_prefix(var, "color.interactive.", &slot_name)) {
+               int slot = parse_clean_color_slot(slot_name);

                if (slot < 0)
                        return 0;
                if (!value)
                if (slot < 0)
                        return 0;
                if (!value)

diff --git a/builtin/commit.c b/builtin/commit.c
index b0fe7847d3cbebd2cef28611171924bf7440c467..cff7802f8f32a174c91e2182f224496f702740b3 100644 (file)
--- a/builtin/commit.c
+++ b/builtin/commit.c
@@ -1294,6 +1294,7 @@ static int parse_status_slot(const char *var, int offset)
 static int git_status_config(const char *k, const char *v, void *cb)
 {
        struct wt_status *s = cb;
 static int git_status_config(const char *k, const char *v, void *cb)
 {
        struct wt_status *s = cb;

+       const char *slot_name;

 
        if (starts_with(k, "column."))
                return git_column_config(k, v, "status", &s->colopts);
 
        if (starts_with(k, "column."))
                return git_column_config(k, v, "status", &s->colopts);


@@ -1323,8 +1324,9 @@ static int git_status_config(const char *k, const char *v, void *cb)
                s->display_comment_prefix = git_config_bool(k, v);
                return 0;
        }
                s->display_comment_prefix = git_config_bool(k, v);
                return 0;
        }

-       if (starts_with(k, "status.color.") || starts_with(k, "color.status.")) {
-               int slot = parse_status_slot(k, 13);
+       if (skip_prefix(k, "status.color.", &slot_name) ||
+           skip_prefix(k, "color.status.", &slot_name)) {
+               int slot = parse_status_slot(k, slot_name - k);

                if (slot < 0)
                        return 0;
                if (!v)
                if (slot < 0)
                        return 0;
                if (!v)


@@ -1513,13 +1515,11 @@ static void print_summary(const char *prefix, const unsigned char *sha1,
        diff_setup_done(&rev.diffopt);
 
        head = resolve_ref_unsafe("HEAD", junk_sha1, 0, NULL);
        diff_setup_done(&rev.diffopt);
 
        head = resolve_ref_unsafe("HEAD", junk_sha1, 0, NULL);

-       printf("[%s%s ",
-               starts_with(head, "refs/heads/") ?
-                       head + 11 :
-                       !strcmp(head, "HEAD") ?
-                               _("detached HEAD") :
-                               head,
-               initial_commit ? _(" (root-commit)") : "");
+       if (!strcmp(head, "HEAD"))
+               head = _("detached HEAD");
+       else
+               skip_prefix(head, "refs/heads/", &head);
+       printf("[%s%s ", head, initial_commit ? _(" (root-commit)") : "");

 
        if (!log_tree_commit(&rev, commit)) {
                rev.always_show_header = 1;
 
        if (!log_tree_commit(&rev, commit)) {
                rev.always_show_header = 1;

diff --git a/builtin/get-tar-commit-id.c b/builtin/get-tar-commit-id.c
index aa72596083d4e7ad9b84058e8b23b09849d74d7c..6f4147ad02b98de298fb054f38fab8e6d10e7335 100644 (file)
--- a/builtin/get-tar-commit-id.c
+++ b/builtin/get-tar-commit-id.c
@@ -19,6 +19,7 @@ int cmd_get_tar_commit_id(int argc, const char **argv, const char *prefix)
        char buffer[HEADERSIZE];
        struct ustar_header *header = (struct ustar_header *)buffer;
        char *content = buffer + RECORDSIZE;
        char buffer[HEADERSIZE];
        struct ustar_header *header = (struct ustar_header *)buffer;
        char *content = buffer + RECORDSIZE;

+       const char *comment;

        ssize_t n;
 
        if (argc != 1)
        ssize_t n;
 
        if (argc != 1)


@@ -29,10 +30,10 @@ int cmd_get_tar_commit_id(int argc, const char **argv, const char *prefix)
                die("git get-tar-commit-id: read error");
        if (header->typeflag[0] != 'g')
                return 1;
                die("git get-tar-commit-id: read error");
        if (header->typeflag[0] != 'g')
                return 1;

-       if (memcmp(content, "52 comment=", 11))
+       if (!skip_prefix(content, "52 comment=", &comment))

                return 1;
 
                return 1;
 

-       n = write_in_full(1, content + 11, 41);
+       n = write_in_full(1, comment, 41);

        if (n < 41)
                die_errno("git get-tar-commit-id: write error");
 
        if (n < 41)
                die_errno("git get-tar-commit-id: write error");
 

diff --git a/builtin/log.c b/builtin/log.c
index 2fb34c7de96a4236327d46bf1392d54fa882c17f..1202eba8b65c019662c5f6b82c13af947bd4d41c 100644 (file)
--- a/builtin/log.c
+++ b/builtin/log.c
@@ -368,6 +368,8 @@ static int cmd_log_walk(struct rev_info *rev)
 
 static int git_log_config(const char *var, const char *value, void *cb)
 {
 
 static int git_log_config(const char *var, const char *value, void *cb)
 {

+       const char *slot_name;
+

        if (!strcmp(var, "format.pretty"))
                return git_config_string(&fmt_pretty, var, value);
        if (!strcmp(var, "format.subjectprefix"))
        if (!strcmp(var, "format.pretty"))
                return git_config_string(&fmt_pretty, var, value);
        if (!strcmp(var, "format.subjectprefix"))


@@ -388,8 +390,8 @@ static int git_log_config(const char *var, const char *value, void *cb)
                default_show_root = git_config_bool(var, value);
                return 0;
        }
                default_show_root = git_config_bool(var, value);
                return 0;
        }

-       if (starts_with(var, "color.decorate."))
-               return parse_decorate_color_config(var, 15, value);
+       if (skip_prefix(var, "color.decorate.", &slot_name))
+               return parse_decorate_color_config(var, slot_name - var, value);

        if (!strcmp(var, "log.mailmap")) {
                use_mailmap_config = git_config_bool(var, value);
                return 0;
        if (!strcmp(var, "log.mailmap")) {
                use_mailmap_config = git_config_bool(var, value);
                return 0;

diff --git a/builtin/remote-ext.c b/builtin/remote-ext.c
index d699d28e98c7e76e3c0a4943b58a8c88acede988..3b8c22cc75ed04eaf450f9d5a1e9e71b914339eb 100644 (file)
--- a/builtin/remote-ext.c
+++ b/builtin/remote-ext.c
@@ -30,16 +30,14 @@ static char *strip_escapes(const char *str, const char *service,
        size_t rpos = 0;
        int escape = 0;
        char special = 0;
        size_t rpos = 0;
        int escape = 0;
        char special = 0;

-       size_t psoff = 0;
+       const char *service_noprefix = service;

        struct strbuf ret = STRBUF_INIT;
 
        struct strbuf ret = STRBUF_INIT;
 

-       /* Calculate prefix length for \s and lengths for \s and \S */
-       if (!strncmp(service, "git-", 4))
-               psoff = 4;
+       skip_prefix(service_noprefix, "git-", &service_noprefix);

 
        /* Pass the service to command. */
        setenv("GIT_EXT_SERVICE", service, 1);
 
        /* Pass the service to command. */
        setenv("GIT_EXT_SERVICE", service, 1);

-       setenv("GIT_EXT_SERVICE_NOPREFIX", service + psoff, 1);
+       setenv("GIT_EXT_SERVICE_NOPREFIX", service_noprefix, 1);

 
        /* Scan the length of argument. */
        while (str[rpos] && (escape || str[rpos] != ' ')) {
 
        /* Scan the length of argument. */
        while (str[rpos] && (escape || str[rpos] != ' ')) {


@@ -85,7 +83,7 @@ static char *strip_escapes(const char *str, const char *service,
                                strbuf_addch(&ret, str[rpos]);
                                break;
                        case 's':
                                strbuf_addch(&ret, str[rpos]);
                                break;
                        case 's':

-                               strbuf_addstr(&ret, service + psoff);
+                               strbuf_addstr(&ret, service_noprefix);

                                break;
                        case 'S':
                                strbuf_addstr(&ret, service);
                                break;
                        case 'S':
                                strbuf_addstr(&ret, service);

diff --git a/pretty.c b/pretty.c
index 5fd9de6ce11da25b8ddf8ece9f718023394624e6..a181ac66875a158514bba48a21911adf9c5cd8be 100644 (file)
--- a/pretty.c
+++ b/pretty.c
@@ -73,10 +73,9 @@ static int git_pretty_formats_config(const char *var, const char *value, void *c
        if (git_config_string(&fmt, var, value))
                return -1;
 
        if (git_config_string(&fmt, var, value))
                return -1;
 

-       if (starts_with(fmt, "format:") || starts_with(fmt, "tformat:")) {
-               commit_format->is_tformat = fmt[0] == 't';
-               fmt = strchr(fmt, ':') + 1;
-       } else if (strchr(fmt, '%'))
+       if (skip_prefix(fmt, "format:", &fmt))
+               commit_format->is_tformat = 0;
+       else if (skip_prefix(fmt, "tformat:", &fmt) || strchr(fmt, '%'))

                commit_format->is_tformat = 1;
        else
                commit_format->is_alias = 1;
                commit_format->is_tformat = 1;
        else
                commit_format->is_alias = 1;


@@ -157,12 +156,12 @@ void get_commit_format(const char *arg, struct rev_info *rev)
                rev->commit_format = CMIT_FMT_DEFAULT;
                return;
        }
                rev->commit_format = CMIT_FMT_DEFAULT;
                return;
        }

-       if (starts_with(arg, "format:") || starts_with(arg, "tformat:")) {
-               save_user_format(rev, strchr(arg, ':') + 1, arg[0] == 't');
+       if (skip_prefix(arg, "format:", &arg)) {
+               save_user_format(rev, arg, 0);

                return;
        }
 
                return;
        }
 

-       if (!*arg || strchr(arg, '%')) {
+       if (!*arg || skip_prefix(arg, "tformat:", &arg) || strchr(arg, '%')) {

                save_user_format(rev, arg, 1);
                return;
        }
                save_user_format(rev, arg, 1);
                return;
        }


@@ -809,18 +808,19 @@ static void parse_commit_header(struct format_commit_context *context)
        int i;
 
        for (i = 0; msg[i]; i++) {
        int i;
 
        for (i = 0; msg[i]; i++) {

+               const char *name;

                int eol;
                for (eol = i; msg[eol] && msg[eol] != '\n'; eol++)
                        ; /* do nothing */
 
                if (i == eol) {
                        break;
                int eol;
                for (eol = i; msg[eol] && msg[eol] != '\n'; eol++)
                        ; /* do nothing */
 
                if (i == eol) {
                        break;

-               } else if (starts_with(msg + i, "author ")) {
-                       context->author.off = i + 7;
-                       context->author.len = eol - i - 7;
-               } else if (starts_with(msg + i, "committer ")) {
-                       context->committer.off = i + 10;
-                       context->committer.len = eol - i - 10;
+               } else if (skip_prefix(msg + i, "author ", &name)) {
+                       context->author.off = name - msg;
+                       context->author.len = msg + eol - name;
+               } else if (skip_prefix(msg + i, "committer ", &name)) {
+                       context->committer.off = name - msg;
+                       context->committer.len = msg + eol - name;

                }
                i = eol;
        }
                }
                i = eol;
        }


@@ -951,6 +951,8 @@ static size_t parse_color(struct strbuf *sb, /* in UTF-8 */
                          const char *placeholder,
                          struct format_commit_context *c)
 {
                          const char *placeholder,
                          struct format_commit_context *c)
 {

+       const char *rest = placeholder;
+

        if (placeholder[1] == '(') {
                const char *begin = placeholder + 2;
                const char *end = strchr(begin, ')');
        if (placeholder[1] == '(') {
                const char *begin = placeholder + 2;
                const char *end = strchr(begin, ')');


@@ -958,10 +960,9 @@ static size_t parse_color(struct strbuf *sb, /* in UTF-8 */
 
                if (!end)
                        return 0;
 
                if (!end)
                        return 0;

-               if (starts_with(begin, "auto,")) {
+               if (skip_prefix(begin, "auto,", &begin)) {

                        if (!want_color(c->pretty_ctx->color))
                                return end - placeholder + 1;
                        if (!want_color(c->pretty_ctx->color))
                                return end - placeholder + 1;

-                       begin += 5;

                }
                color_parse_mem(begin,
                                end - begin,
                }
                color_parse_mem(begin,
                                end - begin,


@@ -969,20 +970,15 @@ static size_t parse_color(struct strbuf *sb, /* in UTF-8 */
                strbuf_addstr(sb, color);
                return end - placeholder + 1;
        }
                strbuf_addstr(sb, color);
                return end - placeholder + 1;
        }

-       if (starts_with(placeholder + 1, "red")) {
+       if (skip_prefix(placeholder + 1, "red", &rest))

                strbuf_addstr(sb, GIT_COLOR_RED);
                strbuf_addstr(sb, GIT_COLOR_RED);

-               return 4;
-       } else if (starts_with(placeholder + 1, "green")) {
+       else if (skip_prefix(placeholder + 1, "green", &rest))

                strbuf_addstr(sb, GIT_COLOR_GREEN);
                strbuf_addstr(sb, GIT_COLOR_GREEN);

-               return 6;
-       } else if (starts_with(placeholder + 1, "blue")) {
+       else if (skip_prefix(placeholder + 1, "blue", &rest))

                strbuf_addstr(sb, GIT_COLOR_BLUE);
                strbuf_addstr(sb, GIT_COLOR_BLUE);

-               return 5;
-       } else if (starts_with(placeholder + 1, "reset")) {
+       else if (skip_prefix(placeholder + 1, "reset", &rest))

                strbuf_addstr(sb, GIT_COLOR_RESET);
                strbuf_addstr(sb, GIT_COLOR_RESET);

-               return 6;
-       } else
-               return 0;
+       return rest - placeholder;

 }
 
 static size_t parse_padding_placeholder(struct strbuf *sb,
 }
 
 static size_t parse_padding_placeholder(struct strbuf *sb,


@@ -1522,7 +1518,7 @@ static void pp_header(struct pretty_print_context *pp,
        int parents_shown = 0;
 
        for (;;) {
        int parents_shown = 0;
 
        for (;;) {

-               const char *line = *msg_p;
+               const char *name, *line = *msg_p;

                int linelen = get_one_line(*msg_p);
 
                if (!linelen)
                int linelen = get_one_line(*msg_p);
 
                if (!linelen)


@@ -1557,14 +1553,14 @@ static void pp_header(struct pretty_print_context *pp,
                 * FULL shows both authors but not dates.
                 * FULLER shows both authors and dates.
                 */
                 * FULL shows both authors but not dates.
                 * FULLER shows both authors and dates.
                 */

-               if (starts_with(line, "author ")) {
+               if (skip_prefix(line, "author ", &name)) {

                        strbuf_grow(sb, linelen + 80);
                        strbuf_grow(sb, linelen + 80);

-                       pp_user_info(pp, "Author", sb, line + 7, encoding);
+                       pp_user_info(pp, "Author", sb, name, encoding);

                }
                }

-               if (starts_with(line, "committer ") &&
+               if (skip_prefix(line, "committer ", &name) &&

                    (pp->fmt == CMIT_FMT_FULL || pp->fmt == CMIT_FMT_FULLER)) {
                        strbuf_grow(sb, linelen + 80);
                    (pp->fmt == CMIT_FMT_FULL || pp->fmt == CMIT_FMT_FULLER)) {
                        strbuf_grow(sb, linelen + 80);

-                       pp_user_info(pp, "Commit", sb, line + 10, encoding);
+                       pp_user_info(pp, "Commit", sb, name, encoding);

                }
        }
 }
                }
        }
 }