subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rhuij...@apache.org
Subject svn commit: r1673803 - in /subversion/trunk/subversion/svnbench: cl.h null-blame-cmd.c svnbench.c
Date Wed, 15 Apr 2015 14:59:06 GMT
Author: rhuijben
Date: Wed Apr 15 14:59:06 2015
New Revision: 1673803

URL: http://svn.apache.org/r1673803
Log:
Following up on r1673785, remove unneeded diff options support from
svnbench. This unbreaks the Windows shared library build.

* subversion/svnbench/cl.h
  (svn_cl__opt_state_t): Remove unneeded variable.

* subversion/svnbench/null-blame-cmd.c
  (svn_cl__null_blame): Remove only initialized variable.

* subversion/svnbench/svnbench.c
  (svn_cl__cmd_table,
   sub_main): Remove 'x' argument handling.

Modified:
    subversion/trunk/subversion/svnbench/cl.h
    subversion/trunk/subversion/svnbench/null-blame-cmd.c
    subversion/trunk/subversion/svnbench/svnbench.c

Modified: subversion/trunk/subversion/svnbench/cl.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svnbench/cl.h?rev=1673803&r1=1673802&r2=1673803&view=diff
==============================================================================
--- subversion/trunk/subversion/svnbench/cl.h (original)
+++ subversion/trunk/subversion/svnbench/cl.h Wed Apr 15 14:59:06 2015
@@ -80,7 +80,6 @@ typedef struct svn_cl__opt_state_t
   svn_boolean_t help;            /* print usage message */
   const char *auth_username;     /* auth username */ /* UTF-8! */
   const char *auth_password;     /* auth password */ /* UTF-8! */
-  const char *extensions;        /* subprocess extension args */ /* UTF-8! */
   apr_array_header_t *targets;   /* target list from file */ /* UTF-8! */
   svn_boolean_t no_auth_cache;   /* do not cache authentication information */
   svn_boolean_t stop_on_copy;    /* don't cross copies during processing */

Modified: subversion/trunk/subversion/svnbench/null-blame-cmd.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svnbench/null-blame-cmd.c?rev=1673803&r1=1673802&r2=1673803&view=diff
==============================================================================
--- subversion/trunk/subversion/svnbench/null-blame-cmd.c (original)
+++ subversion/trunk/subversion/svnbench/null-blame-cmd.c Wed Apr 15 14:59:06 2015
@@ -176,7 +176,6 @@ svn_cl__null_blame(apr_getopt_t *os,
   apr_array_header_t *targets;
   int i;
   svn_boolean_t end_revision_unspecified = FALSE;
-  svn_diff_file_options_t *diff_options = svn_diff_file_options_create(pool);
   svn_boolean_t seen_nonexistent_target = FALSE;
 
   SVN_ERR(svn_cl__args_to_target_array_print_reserved(&targets, os,
@@ -214,13 +213,6 @@ svn_cl__null_blame(apr_getopt_t *os,
   */
   iterpool = svn_pool_create(pool);
 
-  if (opt_state->extensions)
-    {
-      apr_array_header_t *opts;
-      opts = svn_cstring_split(opt_state->extensions, " \t\n\r", TRUE, pool);
-      SVN_ERR(svn_diff_file_options_parse(diff_options, opts, pool));
-    }
-
   for (i = 0; i < targets->nelts; i++)
     {
       svn_error_t *err;

Modified: subversion/trunk/subversion/svnbench/svnbench.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svnbench/svnbench.c?rev=1673803&r1=1673802&r2=1673803&view=diff
==============================================================================
--- subversion/trunk/subversion/svnbench/svnbench.c (original)
+++ subversion/trunk/subversion/svnbench/svnbench.c Wed Apr 15 14:59:06 2015
@@ -301,8 +301,7 @@ const svn_opt_subcommand_desc2_t svn_cl_
      "  follow copy history by default.  Use --stop-on-copy to disable this\n"
      "  behavior, which can be useful for determining branchpoints.\n"),
     {'r', 'q', 'v', 'g', 'c', opt_targets, opt_stop_on_copy,
-     'l', opt_with_all_revprops, opt_with_no_revprops, opt_with_revprop,
-     'x',},
+     'l', opt_with_all_revprops, opt_with_no_revprops, opt_with_revprop,},
     {{opt_with_revprop, N_("retrieve revision property ARG")},
      {'c', N_("the change made in revision ARG")}} },
 
@@ -640,10 +639,6 @@ sub_main(int *exit_code, int argc, const
       case opt_trust_server_cert_other_failure:
         opt_state.trust_server_cert_other_failure = TRUE;
         break;
-      case 'x':
-        SVN_ERR(svn_utf_cstring_to_utf8(&opt_state.extensions,
-                                            opt_arg, pool));
-        break;
       case opt_config_dir:
         {
           const char *path_utf8;



Mime
View raw message