You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by rh...@apache.org on 2010/03/07 22:45:50 UTC

svn commit: r920124 - /subversion/trunk/subversion/libsvn_client/cleanup.c

Author: rhuijben
Date: Sun Mar  7 21:45:50 2010
New Revision: 920124

URL: http://svn.apache.org/viewvc?rev=920124&view=rev
Log:
* subversion/libsvn_client/cleanup.c
  (svn_client_upgrade): Plug an error leak and remove an unneeded if.

Modified:
    subversion/trunk/subversion/libsvn_client/cleanup.c

Modified: subversion/trunk/subversion/libsvn_client/cleanup.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/cleanup.c?rev=920124&r1=920123&r2=920124&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/cleanup.c (original)
+++ subversion/trunk/subversion/libsvn_client/cleanup.c Sun Mar  7 21:45:50 2010
@@ -188,17 +188,16 @@
 
           if (err && err->apr_err == SVN_ERR_WC_UPGRADE_REQUIRED)
             {
+              svn_error_clear(err);
+
               SVN_ERR(svn_wc_upgrade(ctx->wc_ctx, external_abspath,
                                      fetch_repos_info, &info_baton,
                                      ctx->cancel_func, ctx->cancel_baton,
                                      ctx->notify_func2, ctx->notify_baton2,
                                      iterpool));
-              svn_error_clear(err);
             }
-          else if (err)
-            return svn_error_return(err);
           else
-            ;
+            SVN_ERR(err);
         }
     }