svn commit: r1232267 - /subversion/trunk/subversion/mod_dav_svn/util.c

[danielsh]

Author: danielsh
Date: Tue Jan 17 02:17:21 2012
New Revision: 1232267

URL: http://svn.apache.org/viewvc?rev=1232267&view=rev
Log:
Follow-up to r1033547: track mod_dav API change.

In r882274, the mod_dav API changed in two ways: the signatures of
dav_new_error() and dav_new_error_tag() changed, and 'struct dav_error'
changed its errno number member into an apr_status_t.  r1033547 tracked
the former change but not the latter.

Review by: Jeff Trawick

* subversion/mod_dav_svn/util.c
  (dav_svn__log_err): Track the change to 'struct dav_error'.

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

Modified: subversion/trunk/subversion/mod_dav_svn/util.c
URL: 
http://svn.apache.org/viewvc/subversion/trunk/subversion/mod_dav_svn/util.c?rev=1232267&r1=1232266&r2=1232267&view=diff
==============================================================================
--- subversion/trunk/subversion/mod_dav_svn/util.c (original)
+++ subversion/trunk/subversion/mod_dav_svn/util.c Tue Jan 17 02:17:21 2012
@@ -631,19 +631,20 @@ void dav_svn__log_err(request_rec *r,
     /* Log the errors */
     /* ### should have a directive to log the first or all */
     for (errscan = err; errscan != NULL; errscan = errscan->prev) {
+        apr_status_t status;
+
         if (errscan->desc == NULL)
             continue;
 
-        if (errscan->save_errno != 0) {
-            errno = errscan->save_errno;
-            ap_log_rerror(APLOG_MARK, level, errno, r, "%s  [%d, #%d]",
-                          errscan->desc, errscan->status, errscan->error_id);
-        }
-        else {
-            ap_log_rerror(APLOG_MARK, level, 0, r,
-                          "%s  [%d, #%d]",
-                          errscan->desc, errscan->status, errscan->error_id);
-        }
+#if AP_MODULE_MAGIC_AT_LEAST(20091119,0)
+        status = errscan->aprerr;
+#else
+        status = errscan->save_errno;
+#endif
+
+        ap_log_rerror(APLOG_MARK, level, status, r,
+                      "%s  [%d, #%d]",
+                      errscan->desc, errscan->status, errscan->error_id);
     }
 }