t: wrap complicated expect_code users in a block

diff --git a/urlmatch.c b/urlmatch.c
index ec87cba75099ebe05e936430ca3b688275e01a4a..132d342bc12bf790f9964f179385aa4f08e6ae00 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;
                }
@@ -412,9 +412,9 @@ static size_t url_match_prefix(const char *url,
        return 0;
 }
 
-int match_urls(const struct url_info *url,
-              const struct url_info *url_prefix,
-              int *exactusermatch)
+static int match_urls(const struct url_info *url,
+                     const struct url_info *url_prefix,
+                     int *exactusermatch)
 {
        /*
         * url_prefix matches url if the scheme, host and port of url_prefix
@@ -483,8 +483,7 @@ int urlmatch_config_entry(const char *var, const char *value, void *cb)
        int user_matched = 0;
        int retval;
 
-       key = skip_prefix(var, collect->section);
-       if (!key || *(key++) != '.') {
+       if (!skip_prefix(var, collect->section, &key) || *(key++) != '.') {
                if (collect->cascade_fn)
                        return collect->cascade_fn(var, value, cb);
                return 0; /* not interested */