mozilla
/
pjs
зеркало из https://github.com/mozilla/pjs.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Bug 113228: Remove nsStr::ChangeCase. r=dbaron, sr=alecf

This commit is contained in:
jaggernaut%netscape.com 2002-01-09 01:44:43 +00:00
Родитель fd33e7c446
Коммит 1bd1b8c7d6
6 изменённых файлов: 0 добавлений и 236 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

96
string/obsolete/bufferRoutines.h
Просмотреть файл

@ -825,102 +825,6 @@ CompareChars gCompare[2][2]={
{&Compare2To1,&Compare2To2},
};
//----------------------------------------------------------------------------------------
//
// This set of methods is used to convert the case of strings...
//
/**
* This method performs a case conversion the data in the given buffer
*
* @update gess 01/04/99
* @param aString is the buffer to be case shifted
* @param aCount is the number of chars to compare
* @param aToUpper tells us whether to convert to upper or lower
* @return 0
*/
PRInt32 ConvertCase1(char* aString,PRUint32 aCount,PRBool aToUpper);
PRInt32 ConvertCase1(char* aString,PRUint32 aCount,PRBool aToUpper){
PRInt32 result=0;
typedef char chartype;
chartype* cp = (chartype*)aString;
chartype* end = cp + aCount-1;
while (cp <= end) {
chartype ch = *cp;
if(aToUpper) {
if ((ch >= 'a') && (ch <= 'z')) {
*cp = chartype('A' + (ch - 'a'));
}
}
else {
if ((ch >= 'A') && (ch <= 'Z')) {
*cp = chartype('a' + (ch - 'A'));
}
}
cp++;
}
return result;
}
//----------------------------------------------------------------------------------------
/**
* This method performs a case conversion the data in the given buffer
*
* @update gess 01/04/99
* @param aString is the buffer to be case shifted
* @param aCount is the number of chars to compare
* @param aToUpper tells us whether to convert to upper or lower
* @return 0
*/
PRInt32 ConvertCase2(char* aString,PRUint32 aCount,PRBool aToUpper);
PRInt32 ConvertCase2(char* aString,PRUint32 aCount,PRBool aToUpper){
PRUnichar* cp = (PRUnichar*)aString;
PRUnichar* end = cp + aCount;
PRInt32 result=0;
while (cp < end) {
PRUnichar ch = *cp;
#if !defined(XPCOM_STANDALONE) && !defined(RICKG_TESTBED) && !defined(STANDALONE_STRING_TESTS)
if (ch & 0xFF80) {
// If we detect a non-ASCII character, fault through to the I18n
// case conversion routines.
nsresult rv = NS_InitCaseConversion();
NS_ASSERTION(NS_SUCCEEDED(rv), "Couldn't get case conv 4");
if (NS_FAILED(rv)) return NS_ERROR_FAILURE;
result = PRInt32(aToUpper
? gCaseConv->ToUpper(cp, cp, end - cp)
: gCaseConv->ToLower(cp, cp, end - cp));
break;
}
#else
NS_ERROR("call not supported in XPCOM_STANDALONE");
#endif
if(aToUpper) {
if ((ch >= 'a') && (ch <= 'z')) {
*cp = PRUnichar('A' + (ch - 'a'));
}
}
else {
if ((ch >= 'A') && (ch <= 'Z')) {
*cp = PRUnichar('a' + (ch - 'A'));
}
}
cp++;
}
return result;
}
typedef PRInt32 (*CaseConverters)(char*,PRUint32,PRBool);
CaseConverters gCaseConverters[]={&ConvertCase1,&ConvertCase2};
//----------------------------------------------------------------------------------------
//

12
string/obsolete/nsStr.cpp
Просмотреть файл

@ -320,18 +320,6 @@ void nsStr::StrTruncate(nsStr& aDest,PRUint32 aDestOffset){
}
/**
* This method forces the given string to upper or lowercase
* @update gess1/7/99
* @param aDest is the string you're going to change
* @param aToUpper: if TRUE, then we go uppercase, otherwise we go lowercase
* @return
*/
void nsStr::ChangeCase(nsStr& aDest,PRBool aToUpper) {
// somehow UnicharUtil return failed, fallback to the old ascii only code
gCaseConverters[aDest.mCharSize](aDest.mStr,aDest.mLength,aToUpper);
}
/**
* This method removes characters from the given set from this string.
* NOTE: aSet is a char*, and it's length is computed using strlen, which assumes null termination.

10
string/obsolete/nsStr.h
Просмотреть файл

@ -360,16 +360,6 @@ struct NS_COM nsStr {
*/
static void StrTruncate(nsStr& aDest,PRUint32 aDestOffset);
/**
* This method is used to perform a case conversion on the given string
*
* @update gess 01/04/99
* @param aDest is the nsStr to be case shifted
* @param toUpper tells us to go upper vs. lower
*/
static void ChangeCase(nsStr& aDest,PRBool aToUpper);
/**
* This method trims chars (given in aSet) from the edges of given buffer
*

96
xpcom/string/obsolete/bufferRoutines.h
Просмотреть файл

@ -825,102 +825,6 @@ CompareChars gCompare[2][2]={
{&Compare2To1,&Compare2To2},
};
//----------------------------------------------------------------------------------------
//
// This set of methods is used to convert the case of strings...
//
/**
* This method performs a case conversion the data in the given buffer
*
* @update gess 01/04/99
* @param aString is the buffer to be case shifted
* @param aCount is the number of chars to compare
* @param aToUpper tells us whether to convert to upper or lower
* @return 0
*/
PRInt32 ConvertCase1(char* aString,PRUint32 aCount,PRBool aToUpper);
PRInt32 ConvertCase1(char* aString,PRUint32 aCount,PRBool aToUpper){
PRInt32 result=0;
typedef char chartype;
chartype* cp = (chartype*)aString;
chartype* end = cp + aCount-1;
while (cp <= end) {
chartype ch = *cp;
if(aToUpper) {
if ((ch >= 'a') && (ch <= 'z')) {
*cp = chartype('A' + (ch - 'a'));
}
}
else {
if ((ch >= 'A') && (ch <= 'Z')) {
*cp = chartype('a' + (ch - 'A'));
}
}
cp++;
}
return result;
}
//----------------------------------------------------------------------------------------
/**
* This method performs a case conversion the data in the given buffer
*
* @update gess 01/04/99
* @param aString is the buffer to be case shifted
* @param aCount is the number of chars to compare
* @param aToUpper tells us whether to convert to upper or lower
* @return 0
*/
PRInt32 ConvertCase2(char* aString,PRUint32 aCount,PRBool aToUpper);
PRInt32 ConvertCase2(char* aString,PRUint32 aCount,PRBool aToUpper){
PRUnichar* cp = (PRUnichar*)aString;
PRUnichar* end = cp + aCount;
PRInt32 result=0;
while (cp < end) {
PRUnichar ch = *cp;
#if !defined(XPCOM_STANDALONE) && !defined(RICKG_TESTBED) && !defined(STANDALONE_STRING_TESTS)
if (ch & 0xFF80) {
// If we detect a non-ASCII character, fault through to the I18n
// case conversion routines.
nsresult rv = NS_InitCaseConversion();
NS_ASSERTION(NS_SUCCEEDED(rv), "Couldn't get case conv 4");
if (NS_FAILED(rv)) return NS_ERROR_FAILURE;
result = PRInt32(aToUpper
? gCaseConv->ToUpper(cp, cp, end - cp)
: gCaseConv->ToLower(cp, cp, end - cp));
break;
}
#else
NS_ERROR("call not supported in XPCOM_STANDALONE");
#endif
if(aToUpper) {
if ((ch >= 'a') && (ch <= 'z')) {
*cp = PRUnichar('A' + (ch - 'a'));
}
}
else {
if ((ch >= 'A') && (ch <= 'Z')) {
*cp = PRUnichar('a' + (ch - 'A'));
}
}
cp++;
}
return result;
}
typedef PRInt32 (*CaseConverters)(char*,PRUint32,PRBool);
CaseConverters gCaseConverters[]={&ConvertCase1,&ConvertCase2};
//----------------------------------------------------------------------------------------
//

12
xpcom/string/obsolete/nsStr.cpp
Просмотреть файл

@ -320,18 +320,6 @@ void nsStr::StrTruncate(nsStr& aDest,PRUint32 aDestOffset){
}
/**
* This method forces the given string to upper or lowercase
* @update gess1/7/99
* @param aDest is the string you're going to change
* @param aToUpper: if TRUE, then we go uppercase, otherwise we go lowercase
* @return
*/
void nsStr::ChangeCase(nsStr& aDest,PRBool aToUpper) {
// somehow UnicharUtil return failed, fallback to the old ascii only code
gCaseConverters[aDest.mCharSize](aDest.mStr,aDest.mLength,aToUpper);
}
/**
* This method removes characters from the given set from this string.
* NOTE: aSet is a char*, and it's length is computed using strlen, which assumes null termination.

10
xpcom/string/obsolete/nsStr.h
Просмотреть файл

@ -360,16 +360,6 @@ struct NS_COM nsStr {
*/
static void StrTruncate(nsStr& aDest,PRUint32 aDestOffset);
/**
* This method is used to perform a case conversion on the given string
*
* @update gess 01/04/99
* @param aDest is the nsStr to be case shifted
* @param toUpper tells us to go upper vs. lower
*/
static void ChangeCase(nsStr& aDest,PRBool aToUpper);
/**
* This method trims chars (given in aSet) from the edges of given buffer
*