Browse Source

Remove now-unused pnUtStr functions.

Darryl Pogue 10 years ago committed by Darryl Pogue
parent
commit
507dc14c89
  1. 169
      Sources/Plasma/NucleusLib/pnUtils/pnUtStr.cpp
  2. 22
      Sources/Plasma/NucleusLib/pnUtils/pnUtStr.h

169
Sources/Plasma/NucleusLib/pnUtils/pnUtStr.cpp

@ -98,16 +98,6 @@ static chartype * IStrDup (const chartype str[]) {
return buffer; return buffer;
} }
//===========================================================================
template<class chartype, class findchartype>
static chartype * IStrChr (chartype * str, findchartype ch, unsigned chars) {
for (; chars--; ++str)
if (*str == ch)
return str;
else if (!*str)
break;
return nil;
}
//=========================================================================== //===========================================================================
template<typename chartype> template<typename chartype>
@ -179,85 +169,6 @@ static uint32_t IStrHashI (const chartype str[], unsigned chars) {
return result; return result;
} }
//===========================================================================
template<class chartype>
static bool IStrTokenize (const chartype * source[], chartype * dest, unsigned chars, const chartype whitespace[], unsigned maxWhitespaceSkipCount) {
// Skip past leading whitespace
bool inQuotes = false;
unsigned whitespaceSkipped = 0;
while (**source && IStrChr(whitespace, **source, (unsigned)-1) && whitespaceSkipped < maxWhitespaceSkipCount) {
inQuotes = (**source == '\"');
++*source;
++whitespaceSkipped;
if (inQuotes)
break;
}
// Copy the token
unsigned offset = 0;
while (**source &&
((inQuotes && (**source != '\"')) || !IStrChr(whitespace, **source, (unsigned)-1))) {
if (offset + 1 < chars)
dest[offset++] = **source;
++*source;
}
// Skip past the terminating quote
if (inQuotes && (**source == '\"'))
++*source;
// Null terminate the destination buffer
if (chars) {
ASSERT(offset < chars);
dest[offset] = 0;
}
// Upon return, 'source' is guaranteed to point to the first character
// following the returned token (and following any closing quotes)
return (offset || inQuotes);
}
//===========================================================================
template<class chartype>
static bool IStrTokenize (const chartype * source[], ARRAY(chartype) * destArray, const chartype whitespace[], unsigned maxWhitespaceSkipCount) {
// Verify that the destination array is empty
ASSERT(!destArray->Count());
// Skip past leading whitespace
bool inQuotes = false;
unsigned whitespaceSkipped = 0;
while (**source && IStrChr(whitespace, **source, (unsigned)-1) && whitespaceSkipped < maxWhitespaceSkipCount) {
inQuotes = (**source == '\"');
++*source;
++whitespaceSkipped;
if (inQuotes)
break;
}
// Copy the token
bool added = false;
while (**source &&
((inQuotes && (**source != '\"')) || !IStrChr(whitespace, **source, (unsigned)-1))) {
destArray->Add(**source);
added = true;
++*source;
}
// Skip past the terminating quote
if (inQuotes && (**source == '\"'))
++*source;
// Null terminate the destination array
destArray->Add(0);
// Upon return, 'source' is guaranteed to point to the first character
// following the returned token (and following any closing quotes)
return (added || inQuotes);
}
/**************************************************************************** /****************************************************************************
@ -276,26 +187,6 @@ wchar_t * StrDup (const wchar_t str[]) {
return IStrDup(str); return IStrDup(str);
} }
//===========================================================================
char * StrChr (char * str, char ch, unsigned chars) {
return IStrChr(str, ch, chars);
}
//===========================================================================
wchar_t * StrChr (wchar_t * str, wchar_t ch, unsigned chars) {
return IStrChr(str, ch, chars);
}
//===========================================================================
const char * StrChr (const char str[], char ch, unsigned chars) {
return IStrChr(str, ch, chars);
}
//===========================================================================
const wchar_t * StrChr (const wchar_t str[], wchar_t ch, unsigned chars) {
return IStrChr(str, ch, chars);
}
//=========================================================================== //===========================================================================
unsigned StrPrintf (char * dest, unsigned count, const char format[], ...) { unsigned StrPrintf (char * dest, unsigned count, const char format[], ...) {
va_list argList; va_list argList;
@ -366,46 +257,6 @@ unsigned StrLen (const wchar_t str[]) {
return IStrLen(str); return IStrLen(str);
} }
//===========================================================================
float StrToFloat (const char source[], const char ** endptr) {
return (float) strtod(source, const_cast<char **>(endptr));
}
//===========================================================================
float StrToFloat (const wchar_t source[], const wchar_t ** endptr) {
return (float) wcstod(source, const_cast<wchar_t **>(endptr));
}
//===========================================================================
int StrToInt (const char source[], const char ** endptr) {
return strtol(source, const_cast<char **>(endptr), 0);
}
//===========================================================================
int StrToInt (const wchar_t source[], const wchar_t ** endptr) {
return wcstol(source, const_cast<wchar_t **>(endptr), 0);
}
//===========================================================================
unsigned StrToUnsigned (char source[], char ** endptr, int radix) {
return strtoul(source, const_cast<char **>(endptr), radix);
}
//===========================================================================
unsigned StrToUnsigned (wchar_t source[], wchar_t ** endptr, int radix) {
return wcstoul(source, const_cast<wchar_t **>(endptr), radix);
}
//===========================================================================
unsigned StrToUnsigned (const char source[], const char ** endptr, int radix) {
return strtoul(source, const_cast<char **>(endptr), radix);
}
//===========================================================================
unsigned StrToUnsigned (const wchar_t source[], const wchar_t ** endptr, int radix) {
return wcstoul(source, const_cast<wchar_t **>(endptr), radix);
}
//=========================================================================== //===========================================================================
uint32_t StrHash (const char str[], unsigned chars) { uint32_t StrHash (const char str[], unsigned chars) {
return IStrHash(str, chars); return IStrHash(str, chars);
@ -425,23 +276,3 @@ uint32_t StrHashI (const char str[], unsigned chars) {
uint32_t StrHashI (const wchar_t str[], unsigned chars) { uint32_t StrHashI (const wchar_t str[], unsigned chars) {
return IStrHashI(str, chars); return IStrHashI(str, chars);
} }
//===========================================================================
bool StrTokenize (const char * source[], char * dest, unsigned chars, const char whitespace[], unsigned maxWhitespaceSkipCount) {
return IStrTokenize(source, dest, chars, whitespace, maxWhitespaceSkipCount);
}
//===========================================================================
bool StrTokenize (const wchar_t * source[], wchar_t * dest, unsigned chars, const wchar_t whitespace[], unsigned maxWhitespaceSkipCount) {
return IStrTokenize(source, dest, chars, whitespace, maxWhitespaceSkipCount);
}
//===========================================================================
bool StrTokenize (const char * source[], ARRAY(char) * destArray, const char whitespace[], unsigned maxWhitespaceSkipCount) {
return IStrTokenize(source, destArray, whitespace, maxWhitespaceSkipCount);
}
//===========================================================================
bool StrTokenize (const wchar_t * source[], ARRAY(wchar_t) * destArray, const wchar_t whitespace[], unsigned maxWhitespaceSkipCount) {
return IStrTokenize(source, destArray, whitespace, maxWhitespaceSkipCount);
}

22
Sources/Plasma/NucleusLib/pnUtils/pnUtStr.h

@ -55,7 +55,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
// Got Damn eap... // Got Damn eap...
// Duplicate Symbols in shlwapi! // Duplicate Symbols in shlwapi!
#ifdef _INC_SHLWAPI #ifdef _INC_SHLWAPI
# undef StrChr
# undef StrDup # undef StrDup
#endif // _INC_SHLWAPI #endif // _INC_SHLWAPI
@ -68,11 +67,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
inline char CharLowerFast (char ch) { return ((ch >= 'A') && (ch <= 'Z')) ? (char )(ch + 'a' - 'A') : ch; } inline char CharLowerFast (char ch) { return ((ch >= 'A') && (ch <= 'Z')) ? (char )(ch + 'a' - 'A') : ch; }
inline wchar_t CharLowerFast (wchar_t ch) { return ((ch >= L'A') && (ch <= L'Z')) ? (wchar_t)(ch + L'a' - L'A') : ch; } inline wchar_t CharLowerFast (wchar_t ch) { return ((ch >= L'A') && (ch <= L'Z')) ? (wchar_t)(ch + L'a' - L'A') : ch; }
char * StrChr (char * str, char ch, unsigned chars = (unsigned)-1);
wchar_t * StrChr (wchar_t * str, wchar_t ch, unsigned chars = (unsigned)-1);
const char * StrChr (const char str[], char ch, unsigned chars = (unsigned)-1);
const wchar_t * StrChr (const wchar_t str[], wchar_t ch, unsigned chars = (unsigned)-1);
unsigned StrPrintf (char * dest, unsigned count, const char format[], ...); unsigned StrPrintf (char * dest, unsigned count, const char format[], ...);
unsigned StrPrintf (wchar_t * dest, unsigned count, const wchar_t format[], ...); unsigned StrPrintf (wchar_t * dest, unsigned count, const wchar_t format[], ...);
@ -94,25 +88,9 @@ int StrCmpI (const wchar_t str1[], const wchar_t str2[], unsigned chars = (unsig
void StrCopy (char * dest, const char source[], unsigned chars); void StrCopy (char * dest, const char source[], unsigned chars);
void StrCopy (wchar_t * dest, const wchar_t source[], unsigned chars); void StrCopy (wchar_t * dest, const wchar_t source[], unsigned chars);
float StrToFloat (const char source[], const char ** endptr);
float StrToFloat (const wchar_t source[], const wchar_t ** endptr);
int StrToInt (const char source[], const char ** endptr);
int StrToInt (const wchar_t source[], const wchar_t ** endptr);
unsigned StrToUnsigned (char source[], char ** endptr, int radix);
unsigned StrToUnsigned (wchar_t source[], wchar_t ** endptr, int radix);
unsigned StrToUnsigned (const char source[], const char ** endptr, int radix);
unsigned StrToUnsigned (const wchar_t source[], const wchar_t ** endptr, int radix);
uint32_t StrHash (const char str[], unsigned chars = (unsigned)-1); uint32_t StrHash (const char str[], unsigned chars = (unsigned)-1);
uint32_t StrHash (const wchar_t str[], unsigned chars = (unsigned)-1); uint32_t StrHash (const wchar_t str[], unsigned chars = (unsigned)-1);
uint32_t StrHashI (const char str[], unsigned chars = (unsigned)-1); uint32_t StrHashI (const char str[], unsigned chars = (unsigned)-1);
uint32_t StrHashI (const wchar_t str[], unsigned chars = (unsigned)-1); uint32_t StrHashI (const wchar_t str[], unsigned chars = (unsigned)-1);
bool StrTokenize (const char * source[], char * dest, unsigned chars, const char whitespace[], unsigned maxWhitespaceSkipCount = (unsigned)-1);
bool StrTokenize (const wchar_t * source[], wchar_t * dest, unsigned chars, const wchar_t whitespace[], unsigned maxWhitespaceSkipCount = (unsigned)-1);
bool StrTokenize (const char * source[], ARRAY(char) * destArray, const char whitespace[], unsigned maxWhitespaceSkipCount = (unsigned)-1);
bool StrTokenize (const wchar_t * source[], ARRAY(wchar_t) * destArray, const wchar_t whitespace[], unsigned maxWhitespaceSkipCount = (unsigned)-1);
#endif #endif

Loading…
Cancel
Save