diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-10-14 10:50:07 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-10-14 10:50:07 -0700 |
| commit | 145c590df8131abe510adde677eb3121cf52d31e (patch) | |
| tree | 1bec212671aca326a5f966df97e159bc25ccdb79 /builtin/remote-ext.c | |
| parent | 63434da0b4966894b5b812965cb3ada3d4101d6c (diff) | |
| parent | e3f1da982e4f14e7146964cb25a5011a3f41e84a (diff) | |
| download | git-145c590df8131abe510adde677eb3121cf52d31e.tar.gz git-145c590df8131abe510adde677eb3121cf52d31e.tar.xz | |
Merge branch 'rs/more-uses-of-skip-prefix'
* rs/more-uses-of-skip-prefix:
use skip_prefix() to avoid more magic numbers
Diffstat (limited to 'builtin/remote-ext.c')
| -rw-r--r-- | builtin/remote-ext.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/builtin/remote-ext.c b/builtin/remote-ext.c index d699d28e9..3b8c22cc7 100644 --- 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 psoff = 0; + const char *service_noprefix = service; 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); - 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] != ' ')) { @@ -85,7 +83,7 @@ static char *strip_escapes(const char *str, const char *service, 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); |