subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From stef...@apache.org
Subject svn commit: r1632695 - in /subversion/trunk/subversion/svnfsfs: svnfsfs.c svnfsfs.h
Date Fri, 17 Oct 2014 23:28:41 GMT
Author: stefan2
Date: Fri Oct 17 23:28:41 2014
New Revision: 1632695

URL: http://svn.apache.org/r1632695
Log:
Follow-up on r1632694: Commit the missing file changes.

* subversion/svnfsfs/svnfsfs.h
  (check_cancel): Declare global cancellation callback to be accessible
                  to all sub-commands.

* subversion/svnfsfs/svnfsfs.c
  (check_cancel): New global cancellation callback. Copied over from
                  svnadmin.c

Modified:
    subversion/trunk/subversion/svnfsfs/svnfsfs.c
    subversion/trunk/subversion/svnfsfs/svnfsfs.h

Modified: subversion/trunk/subversion/svnfsfs/svnfsfs.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svnfsfs/svnfsfs.c?rev=1632695&r1=1632694&r2=1632695&view=diff
==============================================================================
--- subversion/trunk/subversion/svnfsfs/svnfsfs.c (original)
+++ subversion/trunk/subversion/svnfsfs/svnfsfs.c Fri Oct 17 23:28:41 2014
@@ -72,6 +72,16 @@ setup_cancellation_signals(void (*handle
 }
 
 
+svn_error_t *
+check_cancel(void *baton)
+{
+  if (cancelled)
+    return svn_error_create(SVN_ERR_CANCELLED, NULL, _("Caught signal"));
+  else
+    return SVN_NO_ERROR;
+}
+
+
 /* Custom filesystem warning function. */
 static void
 warning_func(void *baton,

Modified: subversion/trunk/subversion/svnfsfs/svnfsfs.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svnfsfs/svnfsfs.h?rev=1632695&r1=1632694&r2=1632695&view=diff
==============================================================================
--- subversion/trunk/subversion/svnfsfs/svnfsfs.h (original)
+++ subversion/trunk/subversion/svnfsfs/svnfsfs.h Fri Oct 17 23:28:41 2014
@@ -74,6 +74,10 @@ open_fs(svn_fs_t **fs,
         const char *path,
         apr_pool_t *pool);
 
+/* Our cancellation callback. */
+svn_error_t *
+check_cancel(void *baton);
+
 #ifdef __cplusplus
 }
 #endif /* __cplusplus */



Mime
View raw message