svn commit: r1934353 - apr/apr/trunk/misc/win32

Author: ivan
Date: Mon May 18 12:47:37 2026
New Revision: 1934353

Log:
Refactoring.

* misc/win32/charset.c
  (encoding_from_codepage): New function. Extracted from
   apr_os_default_encoding().
  (apr_os_default_encoding, apr_os_locale_encoding): Use
   encoding_from_codepage.

Modified:
   apr/apr/trunk/misc/win32/charset.c

Modified: apr/apr/trunk/misc/win32/charset.c
==============================================================================
--- apr/apr/trunk/misc/win32/charset.c	Mon May 18 11:55:34 2026	(r1934352)
+++ apr/apr/trunk/misc/win32/charset.c	Mon May 18 12:47:37 2026	(r1934353)
@@ -18,10 +18,14 @@
 #include "apr_strings.h"
 #include "apr_portable.h"
 
+static const char * encoding_from_codepage(DWORD codepage, apr_pool_t *pool)
+{
+    return apr_psprintf(pool, "CP%u", (unsigned)codepage);
+}
 
 APR_DECLARE(const char*) apr_os_default_encoding (apr_pool_t *pool)
 {
-    return apr_psprintf(pool, "CP%u", (unsigned) GetACP());
+    return encoding_from_codepage(GetACP(), pool);
 }
 
 
@@ -35,7 +39,7 @@ APR_DECLARE(const char*) apr_os_locale_e
                           (LPTSTR)&codepage,
                           sizeof(codepage) / sizeof(TCHAR)))
     {
-        return apr_psprintf(pool, "CP%u", codepage);
+        return encoding_from_codepage(codepage, pool);
     }
 
     return apr_os_default_encoding(pool);