http: simplify update_url_from_redirect

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>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/http.c b/http.c
index d8e427b69b43a8cc0607893e59891fc8a4356f51..d4034a14ba004c221ad95f3b8e9a225e850d62ea 100644 (file)
--- a/http.c
+++ b/http.c
@@ -1500,7 +1500,7 @@ static int update_url_from_redirect(struct strbuf *base,
                                    const struct strbuf *got)
 {
        const char *tail;
                                    const struct strbuf *got)
 {
        const char *tail;

-       size_t tail_len;
+       size_t new_len;

 
        if (!strcmp(asked, got->buf))
                return 0;
 
        if (!strcmp(asked, got->buf))
                return 0;


@@ -1509,14 +1509,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);
 
                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);
                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;
 }
 
        return 1;
 }