svn commit: r1682076 - in /subversion/trunk/subversion: libsvn_fs_fs/revprops.c libsvn_fs_x/revprops.c libsvn_subr/io.c libsvn_wc/upgrade.c

[ivan]

Author: ivan
Date: Wed May 27 16:51:55 2015
New Revision: 1682076

URL: http://svn.apache.org/r1682076
Log:
Use consistent form for cancel callback invocation. No functional changes
intended.

* subversion/libsvn_fs_fs/revprops.c
* subversion/libsvn_fs_x/revprops.c
* subversion/libsvn_subr/io.c
* subversion/libsvn_wc/upgrade.c
  (svn_fs_fs__delete_revprops_shard, svn_fs_x__delete_revprops_shard,
   svn_io_remove_dir2, svn_wc__wipe_postupgrade): Use "cancel_func(baton)"
   form instead of "(*cancel_func)(baton)" like we in all other code.

Modified:
    subversion/trunk/subversion/libsvn_fs_fs/revprops.c
    subversion/trunk/subversion/libsvn_fs_x/revprops.c
    subversion/trunk/subversion/libsvn_subr/io.c
    subversion/trunk/subversion/libsvn_wc/upgrade.c

Modified: subversion/trunk/subversion/libsvn_fs_fs/revprops.c
URL: 
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_fs/revprops.c?rev=1682076&r1=1682075&r2=1682076&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_fs/revprops.c (original)
+++ subversion/trunk/subversion/libsvn_fs_fs/revprops.c Wed May 27 16:51:55 2015
@@ -1352,7 +1352,7 @@ svn_fs_fs__delete_revprops_shard(const c
                                  apr_psprintf(iterpool, "%d", i),
                                  iterpool);
           if (cancel_func)
-            SVN_ERR((*cancel_func)(cancel_baton));
+            SVN_ERR(cancel_func(cancel_baton));
 
           SVN_ERR(svn_io_remove_file2(path, TRUE, iterpool));
         }

Modified: subversion/trunk/subversion/libsvn_fs_x/revprops.c
URL: 
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_x/revprops.c?rev=1682076&r1=1682075&r2=1682076&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_x/revprops.c (original)
+++ subversion/trunk/subversion/libsvn_fs_x/revprops.c Wed May 27 16:51:55 2015
@@ -1932,7 +1932,7 @@ svn_fs_x__delete_revprops_shard(const ch
                                  apr_psprintf(iterpool, "%d", i),
                                  iterpool);
           if (cancel_func)
-            SVN_ERR((*cancel_func)(cancel_baton));
+            SVN_ERR(cancel_func(cancel_baton));
 
           SVN_ERR(svn_io_remove_file2(path, TRUE, iterpool));
         }

Modified: subversion/trunk/subversion/libsvn_subr/io.c
URL: 
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_subr/io.c?rev=1682076&r1=1682075&r2=1682076&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_subr/io.c (original)
+++ subversion/trunk/subversion/libsvn_subr/io.c Wed May 27 16:51:55 2015
@@ -2567,7 +2567,7 @@ svn_io_remove_dir2(const char *path, svn
      If we need to bail out, do so early. */
 
   if (cancel_func)
-    SVN_ERR((*cancel_func)(cancel_baton));
+    SVN_ERR(cancel_func(cancel_baton));
 
   subpool = svn_pool_create(pool);
 
@@ -2600,7 +2600,7 @@ svn_io_remove_dir2(const char *path, svn
       else
         {
           if (cancel_func)
-            SVN_ERR((*cancel_func)(cancel_baton));
+            SVN_ERR(cancel_func(cancel_baton));
 
           err = svn_io_remove_file2(fullpath, FALSE, subpool);
           if (err)

Modified: subversion/trunk/subversion/libsvn_wc/upgrade.c
URL: 
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/upgrade.c?rev=1682076&r1=1682075&r2=1682076&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/upgrade.c (original)
+++ subversion/trunk/subversion/libsvn_wc/upgrade.c Wed May 27 16:51:55 2015
@@ -535,7 +535,7 @@ svn_wc__wipe_postupgrade(const char *dir
   int i;
 
   if (cancel_func)
-    SVN_ERR((*cancel_func)(cancel_baton));
+    SVN_ERR(cancel_func(cancel_baton));
 
   err = get_versioned_subdirs(&subdirs, &delete_dir, dir_abspath, TRUE,
                               scratch_pool, iterpool);