subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From stef...@apache.org
Subject svn commit: r1622955 - /subversion/trunk/subversion/libsvn_fs/fs-loader.c
Date Sat, 06 Sep 2014 22:19:40 GMT
Author: stefan2
Date: Sat Sep  6 22:19:40 2014
New Revision: 1622955

URL: http://svn.apache.org/r1622955
Log:
By default, we abort / malfunction if some cache access function returned
an error such like out-of-range.  Usually, the server would plug its own
logging callback here.

During verification, however, there is no such server callback.  Moreover,
we want all errors to be reported nicely instead of aborting the process.

* subversion/libsvn_fs/fs-loader.c
  (verify_fs_warning_func):  New, empty warning callback
  (svn_fs_verify):  Let all errors be reported through the svn_error_t*
                    return value mechanism.

Modified:
    subversion/trunk/subversion/libsvn_fs/fs-loader.c

Modified: subversion/trunk/subversion/libsvn_fs/fs-loader.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs/fs-loader.c?rev=1622955&r1=1622954&r2=1622955&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs/fs-loader.c (original)
+++ subversion/trunk/subversion/libsvn_fs/fs-loader.c Sat Sep  6 22:19:40 2014
@@ -558,6 +558,13 @@ svn_fs_upgrade2(const char *path,
   return SVN_NO_ERROR;
 }
 
+/* A warning handling function that does not abort on errors,
+   but just lets them be returned normally.  */
+static void
+verify_fs_warning_func(void *baton, svn_error_t *err)
+{
+}
+
 svn_error_t *
 svn_fs_verify(const char *path,
               apr_hash_t *fs_config,
@@ -574,6 +581,7 @@ svn_fs_verify(const char *path,
 
   SVN_ERR(fs_library_vtable(&vtable, path, pool));
   fs = fs_new(fs_config, pool);
+  svn_fs_set_warning_func(fs, verify_fs_warning_func, NULL);
 
   SVN_ERR(vtable->verify_fs(fs, path, start, end,
                             notify_func, notify_baton,



Mime
View raw message