On the 'utf8-cmdline-prototype' branch: Move implementation of the

svn_opt_args_to_target_array4() function away from deprecated.c into opt.c.

* subversion/libsvn_subr/deprecated.c
  (svn_opt_args_to_target_array4): Remove.

* subversion/libsvn_subr/opt.c
  (svn_opt_args_to_target_array4): Add.


git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/utf8-cmdline-prototype@1930449 13f79535-47bb-0310-9956-ffa450edef68

Author: rinrab

subversion/libsvn_subr/deprecated.c

@@ -808,20 +808,6 @@ svn_opt_subcommand_help(const char *subcommand,
   }
 }
 
-svn_error_t *
-svn_opt_args_to_target_array4(apr_array_header_t **targets_p,
-                              apr_getopt_t *os,
-                              const apr_array_header_t *known_targets,
-                              apr_pool_t *pool)
-{
-  apr_array_header_t *utf8_input_targets;
-
-  SVN_ERR(svn_opt_parse_all_args(&utf8_input_targets, os, pool));
-
-  return svn_error_trace(svn_opt__process_target_array(
-      targets_p, utf8_input_targets, known_targets, pool));
-}
-
 svn_error_t *
 svn_opt_args_to_target_array3(apr_array_header_t **targets_p,
                               apr_getopt_t *os,

subversion/libsvn_subr/opt.c

@@ -350,6 +350,20 @@ svn_opt__process_target_array(apr_array_header_t **targets_p,
   return err;
 }
 
+svn_error_t *
+svn_opt_args_to_target_array4(apr_array_header_t **targets_p,
+                              apr_getopt_t *os,
+                              const apr_array_header_t *known_targets,
+                              apr_pool_t *pool)
+{
+  apr_array_header_t *utf8_input_targets;
+
+  SVN_ERR(svn_opt_parse_all_args(&utf8_input_targets, os, pool));
+
+  return svn_error_trace(svn_opt__process_target_array(
+      targets_p, utf8_input_targets, known_targets, pool));
+}
+
 svn_error_t *
 svn_opt_parse_revprop2(apr_hash_t **revprop_table_p,
                        const char *revprop_spec,