svn commit: r1909368 - /httpd/httpd/trunk/server/core.c

[yl...@apache.org]

Author: ylavic
Date: Sun Apr 23 20:44:21 2023
New Revision: 1909368

URL: http://svn.apache.org/viewvc?rev=1909368&view=rev
Log:
Follow up to r1909356: c89/style fix.

Modified:
    httpd/httpd/trunk/server/core.c

Modified: httpd/httpd/trunk/server/core.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/core.c?rev=1909368&r1=1909367&r2=1909368&view=diff
==============================================================================
--- httpd/httpd/trunk/server/core.c (original)
+++ httpd/httpd/trunk/server/core.c Sun Apr 23 20:44:21 2023
@@ -2552,9 +2552,9 @@ static const char *dirsection(cmd_parms
             return "Regex could not be compiled";
         }
     }
-    else if (strcmp(cmd->path, "/") != 0)
-    {
+    else if (strcmp(cmd->path, "/") != 0) {
         int run_mode = ap_state_query(AP_SQ_RUN_MODE);
+        apr_status_t rv;
         char *newpath;
 
         cmd->regex = NULL;
@@ -2562,8 +2562,8 @@ static const char *dirsection(cmd_parms
         /*
          * Ensure that the pathname is canonical, and append the trailing /
          */
-        apr_status_t rv = apr_filepath_merge(&newpath, NULL, cmd->path,
-                                             APR_FILEPATH_TRUENAME, cmd->pool);
+        rv = apr_filepath_merge(&newpath, NULL, cmd->path,
+                                APR_FILEPATH_TRUENAME, cmd->pool);
         if (rv != APR_SUCCESS && rv != APR_EPATHWILD) {
             return apr_pstrcat(cmd->pool, "<Directory \"", cmd->path,
                                "\"> path is invalid.", NULL);