commit 8346b1148bfa76c0e7f16e1a2c02a20d4cd659f9
author Timofei Zhakov <rinrab@apache.org> Sat Jun 07 18:11:56 2025 +0000
committer Timofei Zhakov <rinrab@apache.org> Sat Jun 07 18:11:56 2025 +0000
tree e96d93169f82bba591b77eb461458b57a3a34540
parent 618c9102ded12e60ed9c2ce6f01b21cda732a615

Revert r1926218.


git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@1926220 13f79535-47bb-0310-9956-ffa450edef68

subversion/include/private/svn_cmdline_private.h

diff --git a/subversion/include/private/svn_cmdline_private.h b/subversion/include/private/svn_cmdline_private.h
index df23cdf..1ca80d5 100644
--- a/subversion/include/private/svn_cmdline_private.h
+++ b/subversion/include/private/svn_cmdline_private.h
@@ -289,12 +289,6 @@
                                     int argc,
                                     const wchar_t *argv[],
                                     apr_pool_t *result_pool);
-
-svn_error_t *
-svn_cmdline__win32_get_utf8_argv(const char **utf8_argv_p[],
-                                 int argc,
-                                 const wchar_t *argv[],
-                                 apr_pool_t *result_pool);
 #endif
 
 /* Default platform-agnostic handler that normalizes command line arguments
@@ -305,22 +299,14 @@
                                       const char *argv[],
                                       apr_pool_t *result_pool);
 
-svn_error_t *
-svn_cmdline__default_get_utf8_argv(const char **utf8_argv_p[],
-                                   int argc,
-                                   const char *argv[],
-                                   apr_pool_t *result_pool);
-
 #if defined(WIN32) && defined(_MSC_VER)
 typedef wchar_t svn_cmdline__argv_char_t;
 #define SVN_CMDLINE__MAIN wmain
 #define svn_cmdline__get_cstring_argv svn_cmdline__win32_get_cstring_argv
-#define svn_cmdline__get_utf8_argv svn_cmdline__win32_get_utf8_argv
 #else
 typedef char svn_cmdline__argv_char_t;
 #define SVN_CMDLINE__MAIN main
 #define svn_cmdline__get_cstring_argv svn_cmdline__default_get_cstring_argv
-#define svn_cmdline__get_utf8_argv svn_cmdline__default_get_utf8_argv
 #endif
 
 #ifdef __cplusplus

subversion/libsvn_subr/cmdline.c

diff --git a/subversion/libsvn_subr/cmdline.c b/subversion/libsvn_subr/cmdline.c
index 68f2f46..2418243 100644
--- a/subversion/libsvn_subr/cmdline.c
+++ b/subversion/libsvn_subr/cmdline.c
@@ -1,4 +1,3 @@
-#include "svn_cmdline_private.h"
 /*
  * cmdline.c :  Helpers for command-line programs.
  *
@@ -1430,32 +1429,10 @@
 
       APR_ARRAY_PUSH(cstring_argv, const char *) = cstring_arg;
     }
-}
 
-svn_error_t *
-svn_cmdline__win32_get_utf8_argv(const char **utf8_argv_p[],
-                                 int argc,
-                                 const wchar_t *argv[],
-                                 apr_pool_t *result_pool)
-{
-  apr_array_header_t *utf8_argv;
-  int i;
+  APR_ARRAY_PUSH(cstring_argv, const char *) = NULL;
 
-  utf8_argv = apr_array_make(result_pool, argc + 1, sizeof(const char *));
-
-  for (i = 0; i < argc; i++)
-    {
-      const wchar_t *arg = argv[i];
-      char *utf8_arg;
-
-      SVN_ERR(svn_utf__win32_utf16_to_utf8(&utf8_arg, arg, NULL, result_pool));
-
-      APR_ARRAY_PUSH(utf8_argv, const char *) = utf8_arg;
-    }
-
-  APR_ARRAY_PUSH(utf8_argv, const char *) = NULL;
-
-  *utf8_argv_p = (const char **)utf8_argv->elts;
+  *cstring_argv_p = (const char **)cstring_argv->elts;
   return SVN_NO_ERROR;
 }
 
@@ -1470,30 +1447,3 @@
   *cstring_argv_p = argv;
   return SVN_NO_ERROR;
 }
-
-svn_error_t *
-svn_cmdline__default_get_utf8_argv(const char **utf8_argv_p[],
-                                   int argc,
-                                   const char *argv[],
-                                   apr_pool_t *result_pool)
-{
-  apr_array_header_t *utf8_argv;
-  int i;
-
-  utf8_argv = apr_array_make(result_pool, argc + 1, sizeof(const char *));
-
-  for (i = 0; i < argc; i++)
-    {
-      const char *arg = argv[i];
-      char *utf8_arg;
-
-      SVN_ERR(svn_utf_cstring_to_utf8(&utf8_arg, arg, result_pool));
-
-      APR_ARRAY_PUSH(utf8_argv, const char *) = utf8_arg;
-    }
-
-  APR_ARRAY_PUSH(utf8_argv, const char *) = NULL;
-
-  *utf8_argv_p = (const char **)utf8_argv->elts;
-  return SVN_NO_ERROR;
-}