svn commit: r1930399 - in subversion/branches/utf8-cmdline-prototype/subversion: libsvn_client libsvn_subr svn svnbench

[email protected]
Newsgroups gmane.comp.version-control.subversion.svn
Message-ID <176530623763.2844285.7330302274887115141@svn02-us-east.apache.org>
Author: rinrab
Date: Tue Dec  9 18:50:37 2025
New Revision: 1930399

Log:
On the 'utf8-cmdline-prototype' branch: Revert unrelated formatting changes to
minimize diff with trunk.

* subversion/libsvn_client/cmdline.c
  (svn_client__process_target_array): Format APR array construction.

* subversion/libsvn_subr/opt.c
  (svn_opt_parse_revprop2): Put space back.

* subversion/svn/svn.c
* subversion/svnbench/svnbench.c
  (sub_main): Format apr_getopt_long call.

Modified:
   subversion/branches/utf8-cmdline-prototype/subversion/libsvn_client/cmdline.c
   subversion/branches/utf8-cmdline-prototype/subversion/libsvn_subr/opt.c
   subversion/branches/utf8-cmdline-prototype/subversion/svn/svn.c
   subversion/branches/utf8-cmdline-prototype/subversion/svnbench/svnbench.c

Modified: subversion/branches/utf8-cmdline-prototype/subversion/libsvn_client/cmdline.c
==============================================================================
--- subversion/branches/utf8-cmdline-prototype/subversion/libsvn_client/cmdline.c	Tue Dec  9 18:47:07 2025	(r1930398)
+++ subversion/branches/utf8-cmdline-prototype/subversion/libsvn_client/cmdline.c	Tue Dec  9 18:50:37 2025	(r1930399)
@@ -123,10 +123,10 @@ svn_client__process_target_array(apr_arr
   int i;
   svn_boolean_t rel_url_found = FALSE;
   const char *root_url = NULL;
-  apr_array_header_t *input_targets = apr_array_make(
-    pool, DEFAULT_ARRAY_SIZE, sizeof(const char *));
-  apr_array_header_t *output_targets = apr_array_make(
-    pool, DEFAULT_ARRAY_SIZE, sizeof(const char *));
+  apr_array_header_t *input_targets =
+    apr_array_make(pool, DEFAULT_ARRAY_SIZE, sizeof(const char *));
+  apr_array_header_t *output_targets =
+    apr_array_make(pool, DEFAULT_ARRAY_SIZE, sizeof(const char *));
   apr_array_header_t *reserved_names = NULL;
 
   /* Step 1:  create a master array of targets that are in UTF-8

Modified: subversion/branches/utf8-cmdline-prototype/subversion/libsvn_subr/opt.c
==============================================================================
--- subversion/branches/utf8-cmdline-prototype/subversion/libsvn_subr/opt.c	Tue Dec  9 18:47:07 2025	(r1930398)
+++ subversion/branches/utf8-cmdline-prototype/subversion/libsvn_subr/opt.c	Tue Dec  9 18:50:37 2025	(r1930399)
@@ -358,11 +358,11 @@ svn_opt_parse_revprop2(apr_hash_t **revp
   const char *sep, *propname;
   svn_string_t *propval;
 
-  if (!*revprop_spec)
+  if (! *revprop_spec)
     return svn_error_create(SVN_ERR_CL_ARG_PARSING_ERROR, NULL,
                             _("Revision property pair is empty"));
 
-  if (!*revprop_table_p)
+  if (! *revprop_table_p)
     *revprop_table_p = apr_hash_make(pool);
 
   sep = strchr(revprop_spec, '=');

Modified: subversion/branches/utf8-cmdline-prototype/subversion/svn/svn.c
==============================================================================
--- subversion/branches/utf8-cmdline-prototype/subversion/svn/svn.c	Tue Dec  9 18:47:07 2025	(r1930398)
+++ subversion/branches/utf8-cmdline-prototype/subversion/svn/svn.c	Tue Dec  9 18:50:37 2025	(r1930399)
@@ -2294,8 +2294,8 @@ sub_main(int *exit_code,
       const char *utf8_opt_arg;
 
       /* Parse the next option. */
-      apr_status_t apr_err = apr_getopt_long(os, svn_cl__options,
-                                             &opt_id, &utf8_opt_arg);
+      apr_status_t apr_err = apr_getopt_long(os, svn_cl__options, &opt_id,
+                                             &utf8_opt_arg);
       if (APR_STATUS_IS_EOF(apr_err))
         break;
       else if (apr_err)

Modified: subversion/branches/utf8-cmdline-prototype/subversion/svnbench/svnbench.c
==============================================================================
--- subversion/branches/utf8-cmdline-prototype/subversion/svnbench/svnbench.c	Tue Dec  9 18:47:07 2025	(r1930398)
+++ subversion/branches/utf8-cmdline-prototype/subversion/svnbench/svnbench.c	Tue Dec  9 18:50:37 2025	(r1930399)
@@ -455,8 +455,8 @@ sub_main(int *exit_code,
       const char *utf8_opt_arg;
 
       /* Parse the next option. */
-      apr_status_t apr_err = apr_getopt_long(os, svn_cl__options,
-                                             &opt_id, &utf8_opt_arg);
+      apr_status_t apr_err = apr_getopt_long(os, svn_cl__options, &opt_id,
+                                             &utf8_opt_arg);
       if (APR_STATUS_IS_EOF(apr_err))
         break;
       else if (apr_err)
lmpx.com only provides a reader for public news (NNTP) servers. It is not affiliated with the servers or forums shown here and is not responsible for the content of articles, which is written by their respective authors.