You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by ko...@apache.org on 2019/10/09 22:01:42 UTC

svn commit: r1868205 - /subversion/trunk/subversion/libsvn_fs_fs/fs.c

Author: kotkov
Date: Wed Oct  9 22:01:42 2019
New Revision: 1868205

URL: http://svn.apache.org/viewvc?rev=1868205&view=rev
Log:
* subversion/libsvn_fs_fs/fs.c
  (fs_ioctl): Minor refactoring.  Explicitly return after handling an ioctl
   in every else-if branch, instead of potentially falling through.

Modified:
    subversion/trunk/subversion/libsvn_fs_fs/fs.c

Modified: subversion/trunk/subversion/libsvn_fs_fs/fs.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_fs/fs.c?rev=1868205&r1=1868204&r2=1868205&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_fs/fs.c (original)
+++ subversion/trunk/subversion/libsvn_fs_fs/fs.c Wed Oct  9 22:01:42 2019
@@ -277,6 +277,7 @@ fs_ioctl(svn_fs_t *fs, svn_fs_ioctl_code
                                        cancel_func, cancel_baton,
                                        result_pool, scratch_pool));
           *output_p = output;
+          return SVN_NO_ERROR;
         }
       else if (ctlcode.code == SVN_FS_FS__IOCTL_DUMP_INDEX.code)
         {
@@ -288,6 +289,7 @@ fs_ioctl(svn_fs_t *fs, svn_fs_ioctl_code
                                         cancel_func, cancel_baton,
                                         scratch_pool));
           *output_p = NULL;
+          return SVN_NO_ERROR;
         }
       else if (ctlcode.code == SVN_FS_FS__IOCTL_LOAD_INDEX.code)
         {
@@ -296,6 +298,7 @@ fs_ioctl(svn_fs_t *fs, svn_fs_ioctl_code
           SVN_ERR(svn_fs_fs__load_index(fs, input->revision, input->entries,
                                         scratch_pool));
           *output_p = NULL;
+          return SVN_NO_ERROR;
         }
       else if (ctlcode.code == SVN_FS_FS__IOCTL_REVISION_SIZE.code)
         {
@@ -307,14 +310,13 @@ fs_ioctl(svn_fs_t *fs, svn_fs_ioctl_code
                                            fs, input->revision,
                                            scratch_pool));
           *output_p = output;
+          return SVN_NO_ERROR;
         }
       else
         return svn_error_create(SVN_ERR_FS_UNRECOGNIZED_IOCTL_CODE, NULL, NULL);
     }
   else
     return svn_error_create(SVN_ERR_FS_UNRECOGNIZED_IOCTL_CODE, NULL, NULL);
-
-  return SVN_NO_ERROR;
 }
 
 /* The vtable associated with a specific open filesystem. */