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:21:34 UTC
svn commit: r1814165 - in /commons/proper/daemon/trunk/src/native/windows:
include/apxwin.h src/utils.c
Author: markt
Date: Fri Nov 3 12:21:34 2017
New Revision: 1814165
URL: http://svn.apache.org/viewvc?rev=1814165&view=rev
Log:
Unicode clean-up. Remove unused code.
Modified:
commons/proper/daemon/trunk/src/native/windows/include/apxwin.h
commons/proper/daemon/trunk/src/native/windows/src/utils.c
Modified: commons/proper/daemon/trunk/src/native/windows/include/apxwin.h
URL: http://svn.apache.org/viewvc/commons/proper/daemon/trunk/src/native/windows/include/apxwin.h?rev=1814165&r1=1814164&r2=1814165&view=diff
==============================================================================
--- commons/proper/daemon/trunk/src/native/windows/include/apxwin.h (original)
+++ commons/proper/daemon/trunk/src/native/windows/include/apxwin.h Fri Nov 3 12:21:34 2017
@@ -152,7 +152,6 @@ LPSTR MzWideToANSI(LPCWSTR ws);
typedef struct APXMULTISZ APXMULTISZ;
typedef APXMULTISZ* LPAPXMULTISZ;
-DWORD apxMultiSzToArrayA(APXHANDLE hPool, LPCSTR lpString, LPSTR **lppArray);
DWORD apxMultiSzToArrayW(APXHANDLE hPool, LPCWSTR lpString, LPWSTR **lppArray);
LPWSTR apxMultiSzCombine(APXHANDLE hPool, LPCWSTR lpStrA, LPCWSTR lpStrB,
LPDWORD lpdwLength);
@@ -169,22 +168,17 @@ DWORD apxStrUnQuoteInplaceW(LP
BOOL apxUltohex(ULONG n, LPTSTR lpBuff, DWORD dwBuffLength);
BOOL apxUptohex(ULONG_PTR n, LPTSTR lpBuff, DWORD dwBuffLength);
-ULONG apxStrToul(LPCTSTR szNum);
-ULONG apxStrToulW(LPCWSTR szNum);
ULONG apxAtoulW(LPCWSTR szNum);
BOOL apxMakeResourceName(LPCTSTR szPrefix, LPTSTR lpBuff,
DWORD dwBuffLength);
-INT apxStrMatchA(LPCSTR szString, LPCSTR szPattern, BOOL bIgnoreCase);
INT apxStrMatchW(LPCWSTR szString, LPCWSTR szPattern, BOOL bIgnoreCase);
INT apxMultiStrMatchW(LPCWSTR szString, LPCWSTR szPattern,
WCHAR chSeparator, BOOL bIgnoreCase);
-LPSTR apxArrayToMultiSzA(APXHANDLE hPool, DWORD nArgs, LPCSTR *lpArgs);
void apxStrQuoteInplaceW(LPWSTR szString);
LPWSTR apxMszToCRLFW(APXHANDLE hPool, LPCWSTR szStr);
LPWSTR apxCRLFToMszW(APXHANDLE hPool, LPCWSTR szStr, LPDWORD lpdwBytes);
-LPSTR apxExpandStrA(APXHANDLE hPool, LPCSTR szString);
LPWSTR apxExpandStrW(APXHANDLE hPool, LPCWSTR szString);
void apxStrCharReplaceA(LPSTR szString, CHAR chReplace, CHAR chReplaceWith);
void apxStrCharReplaceW(LPWSTR szString, WCHAR chReplace, WCHAR chReplaceWith);
Modified: commons/proper/daemon/trunk/src/native/windows/src/utils.c
URL: http://svn.apache.org/viewvc/commons/proper/daemon/trunk/src/native/windows/src/utils.c?rev=1814165&r1=1814164&r2=1814165&view=diff
==============================================================================
--- commons/proper/daemon/trunk/src/native/windows/src/utils.c (original)
+++ commons/proper/daemon/trunk/src/native/windows/src/utils.c Fri Nov 3 12:21:34 2017
@@ -330,35 +330,6 @@ apxMultiSzToArrayW(APXHANDLE hPool, LPCW
return n;
}
-DWORD
-apxMultiSzToArrayA(APXHANDLE hPool, LPCSTR lpString, LPSTR **lppArray)
-{
- DWORD i, n, l;
- char *buff;
- LPSTR p;
-
- l = __apxGetMultiSzLengthA(lpString, &n);
- if (!n || !l)
- return 0;
- if (IS_INVALID_HANDLE(hPool))
- buff = apxPoolAlloc(hPool, (n + 2) * sizeof(LPTSTR) + (l + 1));
- else
- buff = apxAlloc((n + 2) * sizeof(LPSTR) + (l + 1) * sizeof(CHAR));
-
- *lppArray = (LPSTR *)buff;
- p = (LPSTR)(buff + (n + 2) * sizeof(LPSTR));
- AplCopyMemory(p, lpString, (l + 1) * sizeof(CHAR));
- for (i = 0; i < n; i++) {
- (*lppArray)[i] = p;
- while (*p)
- p++;
- p++;
- }
- (*lppArray)[++i] = NULL;
-
- return n;
-}
-
#define QSTR_BOUNDARY 127
#define QSTR_ALIGN(size) \
(((size) + QSTR_BOUNDARY + sizeof(APXMULTISZ) + 2) & ~(QSTR_BOUNDARY))
@@ -498,92 +469,6 @@ BOOL apxUptohex(ULONG_PTR n, LPTSTR lpBu
return TRUE;
}
-ULONG apxStrToul(LPCTSTR szNum)
-{
- ULONG rv = 0;
- DWORD sh = 0;
- LPCTSTR p = szNum;
- ++p;
- while (*p && (*p != TEXT('x')) && (*(p - 1) != TEXT('0')))
- p++;
- if (*p != 'x')
- return 0;
- /* go to the last digit */
- while (*(p + 1)) p++;
-
- /* go back to 'x' */
- while (*p != TEXT('x')) {
- ULONG v = 0;
- switch (*p--) {
- case TEXT('0'): v = 0UL; break;
- case TEXT('1'): v = 1UL; break;
- case TEXT('2'): v = 2UL; break;
- case TEXT('3'): v = 3UL; break;
- case TEXT('4'): v = 4UL; break;
- case TEXT('5'): v = 5UL; break;
- case TEXT('6'): v = 6UL; break;
- case TEXT('7'): v = 7UL; break;
- case TEXT('8'): v = 8UL; break;
- case TEXT('9'): v = 9UL; break;
- case TEXT('a'): case TEXT('A'): v = 10UL; break;
- case TEXT('b'): case TEXT('B'): v = 11UL; break;
- case TEXT('c'): case TEXT('C'): v = 12UL; break;
- case TEXT('d'): case TEXT('D'): v = 13UL; break;
- case TEXT('e'): case TEXT('E'): v = 14UL; break;
- case TEXT('f'): case TEXT('F'): v = 15UL; break;
- default:
- return 0;
- break;
- }
- rv |= rv + (v << sh);
- sh += 4;
- }
- return rv;
-}
-
-ULONG apxStrToulW(LPCWSTR szNum)
-{
- ULONG rv = 0;
- DWORD sh = 0;
- LPCWSTR p = szNum;
- ++p;
- while (*p && (*p != L'x') && (*(p - 1) != L'0'))
- p++;
- if (*p != L'x')
- return 0;
- /* go to the last digit */
- while (*(p + 1)) p++;
-
- /* go back to 'x' */
- while (*p != L'x') {
- ULONG v = 0;
- switch (*p--) {
- case L'0': v = 0UL; break;
- case L'1': v = 1UL; break;
- case L'2': v = 2UL; break;
- case L'3': v = 3UL; break;
- case L'4': v = 4UL; break;
- case L'5': v = 5UL; break;
- case L'6': v = 6UL; break;
- case L'7': v = 7UL; break;
- case L'8': v = 8UL; break;
- case L'9': v = 9UL; break;
- case L'a': case L'A': v = 10UL; break;
- case L'b': case L'B': v = 11UL; break;
- case L'c': case L'C': v = 12UL; break;
- case L'd': case L'D': v = 13UL; break;
- case L'e': case L'E': v = 14UL; break;
- case L'f': case L'F': v = 15UL; break;
- default:
- return 0;
- break;
- }
- rv |= rv + (v << sh);
- sh += 4;
- }
- return rv;
-}
-
ULONG apxAtoulW(LPCWSTR szNum)
{
ULONG rv = 0;
@@ -636,43 +521,6 @@ apxMakeResourceName(LPCTSTR szPrefix, LP
lstrcpy(lpBuff, szPrefix);
return apxUltohex(GetCurrentProcessId(), lpBuff + pl, dwBuffLength - pl);
}
-/** apxStrMatchA ANSI string pattern matching
- * Match = 0, NoMatch = 1, Abort = -1
- * Based loosely on sections of wildmat.c by Rich Salz
- */
-INT apxStrMatchA(LPCSTR szString, LPCSTR szPattern, BOOL bIgnoreCase)
-{
- int x, y;
-
- for (x = 0, y = 0; szPattern[y]; ++y, ++x) {
- if (!szPattern[x] && (szPattern[y] != '*' || szPattern[y] != '?'))
- return -1;
- if (szPattern[y] == '*') {
- while (szPattern[++y] == '*');
- if (!szPattern[y])
- return 0;
- while (szString[x]) {
- INT rc;
- if ((rc = apxStrMatchA(&szString[x++], &szPattern[y],
- bIgnoreCase)) != 1)
- return rc;
- }
- return -1;
- }
- else if (szPattern[y] != '?') {
- if (bIgnoreCase) {
- if (CharLowerA((LPSTR)((SIZE_T)szString[x])) !=
- CharLowerA((LPSTR)((SIZE_T)szPattern[y])))
- return 1;
- }
- else {
- if (szString[x] != szPattern[y])
- return 1;
- }
- }
- }
- return (szString[x] != '\0');
-}
INT apxStrMatchW(LPCWSTR szString, LPCWSTR szPattern, BOOL bIgnoreCase)
{
@@ -741,27 +589,6 @@ INT apxMultiStrMatchW(LPCWSTR szString,
return m;
}
-LPSTR apxArrayToMultiSzA(APXHANDLE hPool, DWORD nArgs, LPCSTR *lpArgs)
-{
- DWORD i, l = 0;
- LPSTR lpSz, p;
- if (!nArgs)
- return NULL;
- for (i = 0; i < nArgs; i++)
- l += lstrlenA(lpArgs[i]);
- l += (nArgs + 2);
-
- p = lpSz = (LPSTR)apxPoolAlloc(hPool, l);
- for (i = 0; i < nArgs; i++) {
- lstrcpyA(p, lpArgs[i]);
- p += lstrlenA(lpArgs[i]);
- *p++ = '\0';
- }
- *p++ = '\0';
- *p++ = '\0';
- return lpSz;
-}
-
void apxStrQuoteInplaceW(LPWSTR szString)
{
LPWSTR p = szString;
@@ -879,36 +706,6 @@ apxCRLFToMszW(APXHANDLE hPool, LPCWSTR s
return rv;
}
-LPSTR
-apxExpandStrA(APXHANDLE hPool, LPCSTR szString)
-{
- LPCSTR p = szString;
- while (*p) {
- if (*p == '%') {
- p = szString;
- break;
- }
- ++p;
- }
- if (p != szString)
- return apxPoolStrdupA(hPool, szString);
- else {
- DWORD l = ExpandEnvironmentStringsA(szString, NULL, 0);
- if (l) {
- LPSTR rv = apxPoolAlloc(hPool, l);
- l = ExpandEnvironmentStringsA(szString, rv, l);
- if (l)
- return rv;
- else {
- apxFree(rv);
- return NULL;
- }
- }
- else
- return NULL;
- }
-}
-
LPWSTR
apxExpandStrW(APXHANDLE hPool, LPCWSTR szString)
{