[PATCH 1/6] http: simplify update_url_from_redirect
- From
Jeff King <peff@peff.net>
- Date
- Dec 1, 2016, 09:03 UTC
- Message-ID
- <20161201090351.4sy4nwxjhbyvacb6@sigill.intra.peff.net>
- In-Reply-To
- <20161201090336.xjbb47bublfcpglo@sigill.intra.peff.net>
This function looks for a common tail between what we asked for and where we were redirected to, but it open-codes the comparison. We can avoid some confusing subtractions by using strip_suffix_mem().
Signed-off-by: Jeff King <peff@peff.net> --- http.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/http.c b/http.c index 4c4a812fc..840dbd1c7 100644 --- a/http.c +++ b/http.c @@ -1664,7 +1664,7 @@ static int update_url_from_redirect(struct strbuf *base, const struct strbuf *got) { const char *tail; - size_t tail_len; + size_t new_len; if (!strcmp(asked, got->buf)) return 0; @@ -1673,14 +1673,12 @@ static int update_url_from_redirect(struct strbuf *base, die("BUG: update_url_from_redirect: %s is not a superset of %s", asked, base->buf); - tail_len = strlen(tail); - - if (got->len < tail_len || - strcmp(tail, got->buf + got->len - tail_len)) + new_len = got->len; + if (!strip_suffix_mem(got->buf, &new_len, tail)) return 0; /* insane redirect scheme */ strbuf_reset(base); - strbuf_add(base, got->buf, got->len - tail_len); + strbuf_add(base, got->buf, new_len); return 1; }
-- 2.11.0.319.g1f4e1e0