svn commit: r1544736 - /subversion/trunk/subversion/libsvn_ra_svn/marshal.c

[stefan2]

Author: stefan2
Date: Sat Nov 23 02:08:59 2013
New Revision: 1544736

URL: http://svn.apache.org/r1544736
Log:
* subversion/libsvn_ra_svn/marshal.c
  (svn_ra_svn__handle_command): code cleanup. No functional change

Modified:
    subversion/trunk/subversion/libsvn_ra_svn/marshal.c

Modified: subversion/trunk/subversion/libsvn_ra_svn/marshal.c
URL: 
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra_svn/marshal.c?rev=1544736&r1=1544735&r2=1544736&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra_svn/marshal.c (original)
+++ subversion/trunk/subversion/libsvn_ra_svn/marshal.c Sat Nov 23 02:08:59 2013
@@ -1521,14 +1521,15 @@ svn_ra_svn__handle_command(svn_boolean_t
                            void *baton,
                            svn_ra_svn_conn_t *conn,
                            svn_boolean_t error_on_disconnect,
-                           apr_pool_t *iterpool)
+                           apr_pool_t *pool)
 {
   const char *cmdname;
   svn_error_t *err, *write_err;
   apr_array_header_t *params;
   const svn_ra_svn_cmd_entry_t *command;
 
-  err = svn_ra_svn__read_tuple(conn, iterpool, "wl", &cmdname, &params);
+  *terminate = FALSE;
+  err = svn_ra_svn__read_tuple(conn, pool, "wl", &cmdname, &params);
   if (err)
     {
       if (!error_on_disconnect
@@ -1540,10 +1541,13 @@ svn_ra_svn__handle_command(svn_boolean_t
         }
       return err;
     }
-  command = svn_hash_gets(cmd_hash, cmdname);
 
+  command = svn_hash_gets(cmd_hash, cmdname);
   if (command)
-    err = (*command->handler)(conn, iterpool, params, baton);
+    {
+      err = (*command->handler)(conn, pool, params, baton);
+      *terminate = command->terminate;
+    }
   else
     {
       err = svn_error_createf(SVN_ERR_RA_SVN_UNKNOWN_CMD, NULL,
@@ -1554,17 +1558,13 @@ svn_ra_svn__handle_command(svn_boolean_t
   if (err && err->apr_err == SVN_ERR_RA_SVN_CMD_ERR)
     {
       write_err = svn_ra_svn__write_cmd_failure(
-                      conn, iterpool,
+                      conn, pool,
                       svn_ra_svn__locate_real_error_child(err));
       svn_error_clear(err);
-      if (write_err)
-        return write_err;
+      return write_err ? write_err : SVN_NO_ERROR;
     }
-  else if (err)
-    return err;
 
-  *terminate = (command && command->terminate);
-  return SVN_NO_ERROR;
+  return err;
 }
 
 svn_error_t *