From: André Malo <nd@apache.org>
Date: Sat, 1 Nov 2003 22:06:28 +0000 (+0000)
Subject: improve readability a (little) bit
X-Git-Tag: pre_ajp_proxy~1086
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4c3949e8b93a3f1297b91b57c9ed5a3212eb687d;p=apache

improve readability a (little) bit


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@101657 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/modules/generators/mod_autoindex.c b/modules/generators/mod_autoindex.c
index bccc2f1e19..dfe229b274 100644
--- a/modules/generators/mod_autoindex.c
+++ b/modules/generators/mod_autoindex.c
@@ -1296,22 +1296,20 @@ static struct ent *make_autoindex_entry(const apr_finfo_t *dirent,
         || ((dirent->name[1] == '.') && !dirent->name[2])))
         return (NULL);
 
-#ifndef CASE_BLIND_FILESYSTEM
-    if (pattern && (apr_fnmatch(pattern, dirent->name,
-                                APR_FNM_NOESCAPE | APR_FNM_PERIOD)
-                        != APR_SUCCESS))
-        return (NULL);
-#else  /* !CASE_BLIND_FILESYSTEM */
-        /*
-         * On some platforms, the match must be case-blind.  This is really
-         * a factor of the filesystem involved, but we can't detect that
-         * reliably - so we have to granularise at the OS level.
-         */
+    /*
+     * On some platforms, the match must be case-blind.  This is really
+     * a factor of the filesystem involved, but we can't detect that
+     * reliably - so we have to granularise at the OS level.
+     */
     if (pattern && (apr_fnmatch(pattern, dirent->name,
-                                APR_FNM_NOESCAPE | APR_FNM_PERIOD | APR_FNM_CASE_BLIND)
-                        != APR_SUCCESS))
+                                APR_FNM_NOESCAPE | APR_FNM_PERIOD
+#ifdef CASE_BLIND_FILESYSTEM
+                                | APR_FNM_CASE_BLIND
+#endif
+                                )
+                    != APR_SUCCESS)) {
         return (NULL);
-#endif /* !CASE_BLIND_FILESYSTEM */
+    }
 
     if (ignore_entry(d, ap_make_full_path(r->pool,
                                           r->filename, dirent->name))) {