svn commit: r1814166 - in /commons/proper/daemon/trunk/src/native/windows: include/handles.h src/handles.c

[markt]

Author: markt
Date: Fri Nov  3 12:31:12 2017
New Revision: 1814166

URL: http://svn.apache.org/viewvc?rev=1814166&view=rev
Log:
Unicode clean-up

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=1814166&r1=1814165&r2=1814166&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:31:12 2017
@@ -149,7 +149,6 @@ DWORD       apxHandleWait(APXHANDLE hHan
 LPVOID      apxPoolAlloc(APXHANDLE hPool, DWORD dwSize);
 LPVOID      apxPoolCalloc(APXHANDLE hPool, DWORD dwSize);
 LPVOID      apxPoolRealloc(APXHANDLE hPool, LPVOID lpMem, DWORD dwNewSize);
-LPTSTR      apxPoolStrdup(APXHANDLE hPool, LPCTSTR szSource);
 
 /** General system pool memory allocation functions
  */
@@ -158,30 +157,13 @@ LPVOID      apxAlloc(DWORD dwSize);
 LPVOID      apxCalloc(DWORD dwSize);
 LPVOID      apxRealloc(LPVOID lpMem, DWORD dwNewSize);
 
-LPSTR       apxStrdupA(LPCSTR szSource);
 LPWSTR      apxStrdupW(LPCWSTR szSource);
-LPSTR       apxPoolStrdupA(APXHANDLE hPool, LPCSTR szSource);
 LPWSTR      apxPoolStrdupW(APXHANDLE hPool, LPCWSTR szSource);
 
 LPWSTR      apxPoolWStrdupA(APXHANDLE hPool, LPCSTR szSource);
 
 #define     apxPoolWStrdupW apxPoolStrdupW
 
-#ifdef _UNICODE
-#define apxStrdup       apxStrdupW
-#define apxPoolStrdup   apxPoolStrdupW
-#else
-#define apxStrdup       apxStrdupA
-#define apxPoolStrdup   apxPoolStrdupW
-#endif
-
-#ifndef _UNICODE
-#define     apxPoolWStrdup  apxPoolWStrdupA
-#define     apxWStrdup      apxWStrdupA
-#else
-#define     apxPoolWStrdup  apxPoolStrdupW
-#define     apxWStrdup      apxStrdupW
-#endif
 /** Free the allocated memory
  * It will call te correct pool if the address is valid
  */

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=1814166&r1=1814165&r2=1814166&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:31:12 2017
@@ -419,25 +419,6 @@ apxPoolWStrdupA(APXHANDLE hPool, LPCSTR
         return NULL;
 }
 
-LPWSTR apxWStrdupA(LPCTSTR szSource)
-{
-    return apxPoolWStrdup(_st_sys_pool, szSource);
-}
-
-LPSTR
-apxPoolStrdupA(APXHANDLE hPool, LPCSTR szSource)
-{
-    if (szSource) {
-        LPSTR szDest;
-        DWORD l = lstrlenA(szSource);
-        szDest = apxPoolAlloc(hPool, l + 1);
-        lstrcpyA(szDest, szSource);
-        return szDest;
-    }
-    else
-        return NULL;
-}
-
 LPWSTR
 apxPoolStrdupW(APXHANDLE hPool, LPCWSTR szSource)
 {
@@ -452,12 +433,6 @@ apxPoolStrdupW(APXHANDLE hPool, LPCWSTR
         return NULL;
 }
 
-LPSTR
-apxStrdupA(LPCSTR szSource)
-{
-    return apxPoolStrdupA(_st_sys_pool, szSource);
-}
-
 LPWSTR
 apxStrdupW(LPCWSTR szSource)
 {