You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by ma...@apache.org on 2017/11/03 12:34:35 UTC
svn commit: r1814168 - in /commons/proper/daemon/trunk/src/native/windows:
include/handles.h src/handles.c
Author: markt
Date: Fri Nov 3 12:34:35 2017
New Revision: 1814168
URL: http://svn.apache.org/viewvc?rev=1814168&view=rev
Log:
Unicode clean-up. Remove unused code.
Modified:
commons/proper/daemon/trunk/src/native/windows/include/handles.h
commons/proper/daemon/trunk/src/native/windows/src/handles.c
Modified: commons/proper/daemon/trunk/src/native/windows/include/handles.h
URL: http://svn.apache.org/viewvc/commons/proper/daemon/trunk/src/native/windows/include/handles.h?rev=1814168&r1=1814167&r2=1814168&view=diff
==============================================================================
--- commons/proper/daemon/trunk/src/native/windows/include/handles.h (original)
+++ commons/proper/daemon/trunk/src/native/windows/include/handles.h Fri Nov 3 12:34:35 2017
@@ -160,8 +160,6 @@ LPVOID apxRealloc(LPVOID lpMem, DWO
LPWSTR apxStrdupW(LPCWSTR szSource);
LPWSTR apxPoolStrdupW(APXHANDLE hPool, LPCWSTR szSource);
-LPWSTR apxPoolWStrdupA(APXHANDLE hPool, LPCSTR szSource);
-
#define apxPoolWStrdupW apxPoolStrdupW
/** Free the allocated memory
Modified: commons/proper/daemon/trunk/src/native/windows/src/handles.c
URL: http://svn.apache.org/viewvc/commons/proper/daemon/trunk/src/native/windows/src/handles.c?rev=1814168&r1=1814167&r2=1814168&view=diff
==============================================================================
--- commons/proper/daemon/trunk/src/native/windows/src/handles.c (original)
+++ commons/proper/daemon/trunk/src/native/windows/src/handles.c Fri Nov 3 12:34:35 2017
@@ -403,23 +403,6 @@ apxFree(LPVOID lpMem)
}
LPWSTR
-apxPoolWStrdupA(APXHANDLE hPool, LPCSTR szSource)
-{
- if (szSource) {
- LPWSTR szDest;
- int cch = MultiByteToWideChar(CP_UTF8, 0, szSource, -1, NULL, 0);
- szDest = (LPWSTR)apxPoolAlloc(hPool, cch * sizeof(WCHAR));
- if (!MultiByteToWideChar(CP_UTF8, 0, szSource, -1, szDest, cch)) {
- apxFree(szDest);
- return NULL;
- }
- return szDest;
- }
- else
- return NULL;
-}
-
-LPWSTR
apxPoolStrdupW(APXHANDLE hPool, LPCWSTR szSource)
{
if (szSource) {