svn commit: r1484785 - /subversion/branches/invoke-diff-cmd-feature/subversion/libsvn_client/diff.c

[gbg]

Author: gbg
Date: Tue May 21 12:48:26 2013
New Revision: 1484785

URL: http://svn.apache.org/r1484785
Log:
On the invoke-diff-cmd branch: Tidy code.

* subversion/libsvn_client/diff.c
  (set_up_diff_cmd_and_options): Tidy code.

Modified:
    subversion/branches/invoke-diff-cmd-feature/subversion/libsvn_client/diff.c

Modified: 
subversion/branches/invoke-diff-cmd-feature/subversion/libsvn_client/diff.c
URL: 
http://svn.apache.org/viewvc/subversion/branches/invoke-diff-cmd-feature/subversion/libsvn_client/diff.c?rev=1484785&r1=1484784&r2=1484785&view=diff
==============================================================================
--- subversion/branches/invoke-diff-cmd-feature/subversion/libsvn_client/diff.c 
(original)
+++ subversion/branches/invoke-diff-cmd-feature/subversion/libsvn_client/diff.c 
Tue May 21 12:48:26 2013
@@ -2460,16 +2460,13 @@ set_up_diff_cmd_and_options(struct diff_
                             const apr_array_header_t *options,
                             apr_hash_t *config, apr_pool_t *pool)
 {
-  const char *diff_cmd;
-
-  diff_cmd = NULL;
+  const char *diff_cmd = NULL;
 
   /* old style diff_cmd has precedence in config file */
   if (config)
     {
-      svn_config_t *cfg;
+      svn_config_t *cfg  = svn_hash_gets(config, SVN_CONFIG_CATEGORY_CONFIG);
 
-      cfg = svn_hash_gets(config, SVN_CONFIG_CATEGORY_CONFIG);
       svn_config_get(cfg, &diff_cmd, SVN_CONFIG_SECTION_HELPERS,
                      SVN_CONFIG_OPTION_DIFF_CMD, NULL);
       if (options == NULL)
@@ -2501,7 +2498,7 @@ set_up_diff_cmd_and_options(struct diff_
          if (diff_cmd) 
            {
              SVN_ERR(svn_path_cstring_to_utf8(
-                      &diff_cmd_baton->invoke_diff_cmd, diff_cmd, pool));
+                                               
&diff_cmd_baton->invoke_diff_cmd, diff_cmd, pool));
              
              return SVN_NO_ERROR;
            }
@@ -2523,7 +2520,9 @@ set_up_diff_cmd_and_options(struct diff_
           argv = apr_palloc(pool, argc * sizeof(char *));
           for (i = 0; i < argc; i++)
             SVN_ERR(svn_utf_cstring_to_utf8(&argv[i],
-                    APR_ARRAY_IDX(options, i, const char *), pool));
+                                            APR_ARRAY_IDX(options, i, 
+                                                          const char *), 
+                                            pool));
         }
       diff_cmd_baton->options.for_external.argv = argv;
       diff_cmd_baton->options.for_external.argc = argc;