svn commit: r1846521 - /subversion/branches/mod-dav-svn-expressions/subversion/mod_dav_svn/mod_dav_svn.c

[br...@apache.org]

Author: brane
Date: Tue Nov 13 16:10:06 2018
New Revision: 1846521

URL: http://svn.apache.org/viewvc?rev=1846521&view=rev
Log:
On the mod_dav_expressions branch: Minor coding style tweaks.

* subversion/mod_dav_svn/mod_dav_svn.c
  (path_expr_t): Fix indentation to our 2-column guidelines.
  (get_path_config, dav_svn__get_root_dir): One variable declaration per line.

Modified:
    subversion/branches/mod-dav-svn-expressions/subversion/mod_dav_svn/mod_dav_svn.c

Modified: subversion/branches/mod-dav-svn-expressions/subversion/mod_dav_svn/mod_dav_svn.c
URL: http://svn.apache.org/viewvc/subversion/branches/mod-dav-svn-expressions/subversion/mod_dav_svn/mod_dav_svn.c?rev=1846521&r1=1846520&r2=1846521&view=diff
==============================================================================
--- subversion/branches/mod-dav-svn-expressions/subversion/mod_dav_svn/mod_dav_svn.c (original)
+++ subversion/branches/mod-dav-svn-expressions/subversion/mod_dav_svn/mod_dav_svn.c Tue Nov 13 16:10:06 2018
@@ -76,9 +76,9 @@ typedef struct server_conf_t {
 
 /* combination of path and expression */
 typedef struct path_expr_t {
-    const char *base;                /* base path */
+  const char *base;                  /* base path */
 #ifdef SVN_AP_HAS_EXPRESSIONS
-    const ap_expr_info_t *expr;      /* expression suffix added to the base */
+  const ap_expr_info_t *expr;        /* expression suffix added to the base */
 #endif /* SVN_AP_HAS_EXPRESSIONS */
 } path_expr_t;
 
@@ -763,9 +763,10 @@ get_path_config(request_rec *r, path_exp
         {
           svn_error_t *serr;
           svn_boolean_t under_root;
-          const char *err = NULL, *suffix;
 
-          suffix = ap_expr_str_exec(r, path->expr, &err);
+          const char *err = NULL;
+          const char *suffix = ap_expr_str_exec(r, path->expr, &err);
+
           if (!err)
             {
               serr = svn_dirent_is_under_root(
@@ -906,9 +907,9 @@ dav_svn__get_root_dir(request_rec *r)
 #ifdef SVN_AP_HAS_EXPRESSIONS
   if (conf->root_expr)
     {
-      const char *err = NULL, *root_dir;
+      const char *err = NULL;
+      const char *root_dir = ap_expr_str_exec(r, conf->root_expr, &err);
 
-      root_dir = ap_expr_str_exec(r, conf->root_expr, &err);
       if (!err)
         {
           return svn_urlpath__canonicalize(root_dir, r->pool);