Author: danielsh
Date: Wed Oct 17 22:29:58 2012
New Revision: 1399465

URL: http://svn.apache.org/viewvc?rev=1399465&view=rev
Log:
Followup to r1399462:

* subversion/mod_dav_svn/repos.c
  (get_resource): Return the correct kind of error.

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

Modified: subversion/trunk/subversion/mod_dav_svn/repos.c
URL: 
http://svn.apache.org/viewvc/subversion/trunk/subversion/mod_dav_svn/repos.c?rev=1399465&r1=1399464&r2=1399465&view=diff
==============================================================================
--- subversion/trunk/subversion/mod_dav_svn/repos.c (original)
+++ subversion/trunk/subversion/mod_dav_svn/repos.c Wed Oct 17 22:29:58 2012
@@ -2231,8 +2231,12 @@ get_resource(request_rec *r,
         }
 
       /* Configure hook script environment variables. */
-      SVN_ERR(svn_repos_hooks_setenv(repos->repos, dav_svn__get_hooks_env(r),
-                                     r->connection->pool, r->pool));
+      serr = svn_repos_hooks_setenv(repos->repos, dav_svn__get_hooks_env(r),
+                                    r->connection->pool, r->pool);
+      if (serr)
+        return dav_svn__sanitize_error(serr,
+                                       "Error settings hooks environment",
+                                       HTTP_INTERNAL_SERVER_ERROR, r);
     }
 
   /* cache the filesystem object */
@@ -3179,7 +3183,7 @@ typedef struct diff_ctx_t {
 } diff_ctx_t;
 
 
-static svn_error_t *
+static svn_error_t *  __attribute__((warn_unused_result))
 write_to_filter(void *baton, const char *buffer, apr_size_t *len)
 {
   diff_ctx_t *dc = baton;
@@ -3200,7 +3204,7 @@ write_to_filter(void *baton, const char 
 }
 
 
-static svn_error_t *
+static svn_error_t *  __attribute__((warn_unused_result))
 close_filter(void *baton)
 {
   diff_ctx_t *dc = baton;


Reply via email to