Merge branch 'maint-2.1' into maint

[thirdparty/git.git] / urlmatch.c

diff --git a/urlmatch.c b/urlmatch.c
index 3d4c54b5cd5d6f6cb4e0ea97550799eb9d46f033..618d2164919758b141aa9d6408c57a4fb99c922c 100644 (file)
--- a/urlmatch.c
+++ b/urlmatch.c
@@ -43,11 +43,11 @@ static int append_normalized_escapes(struct strbuf *buf,
                from_len--;
                if (ch == '%') {
                        if (from_len < 2 ||
-                           !isxdigit((unsigned char)from[0]) ||
-                           !isxdigit((unsigned char)from[1]))
+                           !isxdigit(from[0]) ||
+                           !isxdigit(from[1]))
                                return 0;
-                       ch = hexval_table[(unsigned char)*from++] << 4;
-                       ch |= hexval_table[(unsigned char)*from++];
+                       ch = hexval(*from++) << 4;
+                       ch |= hexval(*from++);
                        from_len -= 2;
                        was_esc = 1;
                }