From c8b9ea7e8332ee5319f95529e1c64eae5706b05e Mon Sep 17 00:00:00 2001 From: Ivan Zhakov Date: Sat, 21 Jan 2023 15:57:47 +0000 Subject: Simplify code. * threadproc/win32/proc.c (apr_proc_create): Use apr_wchar_t for pEnvBlock local variable and avoid unnecessary casts. git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@1906887 13f79535-47bb-0310-9956-ffa450edef68 --- threadproc/win32/proc.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/threadproc/win32/proc.c b/threadproc/win32/proc.c index 7261f5204..95e4940c1 100644 --- a/threadproc/win32/proc.c +++ b/threadproc/win32/proc.c @@ -503,7 +503,7 @@ APR_DECLARE(apr_status_t) apr_proc_create(apr_proc_t *new, apr_size_t i; const char *argv0; char *cmdline; - char *pEnvBlock; + apr_wchar_t *pEnvBlock; PROCESS_INFORMATION pi; DWORD dwCreationFlags = 0; @@ -702,11 +702,11 @@ APR_DECLARE(apr_status_t) apr_proc_create(apr_proc_t *new, { apr_wchar_t *pNext; - pEnvBlock = (char *)apr_palloc(pool, iEnvBlockLen * sizeof(apr_wchar_t)); + pEnvBlock = apr_palloc(pool, iEnvBlockLen * sizeof(apr_wchar_t)); dwCreationFlags |= CREATE_UNICODE_ENVIRONMENT; i = 0; - pNext = (apr_wchar_t*)pEnvBlock; + pNext = pEnvBlock; while (env[i]) { apr_size_t in = strlen(env[i]) + 1; if ((rv = apr_conv_utf8_to_utf16(env[i], &in, -- cgit v1.2.1