Refactoring.

Ivan Zhakov · Ivan Zhakov · commit e0bf817cd2b4 · 2026-05-18T12:47:37.000Z
* 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. git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@1934353 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/misc/win32/charset.c b/misc/win32/charset.c
@@ -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_encoding (apr_pool_t *pool)
                           (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);

Original file line number	Diff line number	Diff line change
`@@ -18,10 +18,14 @@`
`18`	`18`	`#include "apr_strings.h"`
`19`	`19`	`#include "apr_portable.h"`
`20`	`20`
	`21`	`+static const char * encoding_from_codepage(DWORD codepage, apr_pool_t *pool)`
	`22`	`+{`
	`23`	`+ return apr_psprintf(pool, "CP%u", (unsigned)codepage);`
	`24`	`+}`
`21`	`25`
`22`	`26`	`APR_DECLARE(const char) apr_os_default_encoding (apr_pool_t pool)`
`23`	`27`	`{`
`24`		`- return apr_psprintf(pool, "CP%u", (unsigned) GetACP());`
	`28`	`+ return encoding_from_codepage(GetACP(), pool);`
`25`	`29`	`}`
`26`	`30`
`27`	`31`
`@@ -35,7 +39,7 @@ APR_DECLARE(const char) apr_os_locale_encoding (apr_pool_t pool)`
`35`	`39`	`(LPTSTR)&codepage,`
`36`	`40`	`sizeof(codepage) / sizeof(TCHAR)))`
`37`	`41`	`{`
`38`		`- return apr_psprintf(pool, "CP%u", codepage);`
	`42`	`+ return encoding_from_codepage(codepage, pool);`
`39`	`43`	`}`
`40`	`44`
`41`	`45`	`return apr_os_default_encoding(pool);`