svn commit: r1052041 - /subversion/trunk/subversion/mod_dav_svn/version.c

[bl...@apache.org]

Author: blair
Date: Wed Dec 22 19:28:11 2010
New Revision: 1052041

URL: http://svn.apache.org/viewvc?rev=1052041&view=rev
Log:
Follow up to r1051978, fix a shadow warning.

I've now switched to using --enable-maintainer-mode, I assumed that
-Wall warns about shadowed variables.

Found by: philip

* subversion/mod_dav_svn/version.c
  (dav_svn__checkin):
    Don't shadow "apr_err", just use the one from a higher scope.

Modified:
    subversion/trunk/subversion/mod_dav_svn/version.c

Modified: subversion/trunk/subversion/mod_dav_svn/version.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/mod_dav_svn/version.c?rev=1052041&r1=1052040&r2=1052041&view=diff
==============================================================================
--- subversion/trunk/subversion/mod_dav_svn/version.c (original)
+++ subversion/trunk/subversion/mod_dav_svn/version.c Wed Dec 22 19:28:11 2010
@@ -922,9 +922,10 @@ dav_svn__checkin(dav_resource *resource,
         {
           if (serr)
             {
-              apr_status_t apr_err = serr->apr_err;
-              const char *post_commit_err = svn_repos__post_commit_error_str
-                                              (serr, resource->pool);
+              const char *post_commit_err;
+              apr_err = serr->apr_err;
+              post_commit_err = svn_repos__post_commit_error_str
+                                  (serr, resource->pool);
               serr = SVN_NO_ERROR;
               ap_log_perror(APLOG_MARK, APLOG_ERR, apr_err, resource->pool,
                             "commit of r%ld succeeded, but an error occurred "