diff options
| author |  René Scharfe <l.s.r@web.de> | 2017-07-08 10:59:19 +0200 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2017-07-09 09:43:01 -0700 |
| commit | 50533135622a80b0326c7e93067e136072bef5eb (patch) | |
| tree | 0e6c773ec82340927d3479481523a47a48abd939 | |
| parent | Git 2.13.2 (diff) | |
| download | tgif-50533135622a80b0326c7e93067e136072bef5eb.tar.xz | |
urlmatch: use hex2chr() in append_normalized_escapes()
Simplify the code by using hex2chr() to convert and check for invalid
characters at the same time instead of doing that sequentially with
one table lookup for each.
Signed-off-by: Rene Scharfe <l.s.r@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | urlmatch.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/urlmatch.c b/urlmatch.c index 4bbde924e8..3e42bd7504 100644 --- a/urlmatch.c +++ b/urlmatch.c @@ -42,12 +42,12 @@ static int append_normalized_escapes(struct strbuf *buf, from_len--; if (ch == '%') { - if (from_len < 2 || - !isxdigit(from[0]) || - !isxdigit(from[1])) + if (from_len < 2) return 0; - ch = hexval(*from++) << 4; - ch |= hexval(*from++); + ch = hex2chr(from); + if (ch < 0) + return 0; + from += 2; from_len -= 2; was_esc = 1; } |