corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 579517 - Part 1: Automated conversion of NSPR numeric types to stdint types in Gecko; r=bsmedberg

Browse Source 
This patch was generated by a script.  Here's the source of the script for
future reference:

function convert() {
echo "Converting $1 to $2..."
find . ! -wholename "*nsprpub*" \
       ! -wholename "*security/nss*" \
       ! -wholename "*/.hg*" \
       ! -wholename "obj-ff-dbg*" \
       ! -name nsXPCOMCID.h \
       ! -name prtypes.h \
         -type f \
      \( -iname "*.cpp" \
         -o -iname "*.h" \
         -o -iname "*.c" \
         -o -iname "*.cc" \
         -o -iname "*.idl" \
         -o -iname "*.ipdl" \
         -o -iname "*.ipdlh" \
         -o -iname "*.mm" \) | \
    xargs -n 1 sed -i -e "s/\b$1\b/$2/g"
}

convert PRInt8 int8_t
convert PRUint8 uint8_t
convert PRInt16 int16_t
convert PRUint16 uint16_t
convert PRInt32 int32_t
convert PRUint32 uint32_t
convert PRInt64 int64_t
convert PRUint64 uint64_t

convert PRIntn int
convert PRUintn unsigned

convert PRSize size_t

convert PROffset32 int32_t
convert PROffset64 int64_t

convert PRPtrdiff ptrdiff_t

convert PRFloat64 double
This commit is contained in:
Ehsan Akhgari
2012-08-22 11:56:38 -04:00
parent 267ef7575d
commit 243c878d26
4098 changed files with 54923 additions and 54923 deletions
Download Patch File Download Diff File Expand all files Collapse all files

276
xpcom/glue/nsStringAPI.cpp
View File

@@ -18,10 +18,10 @@
// nsAString
PRUint32
uint32_t
nsAString::BeginReading(const char_type **begin, const char_type **end) const
{
PRUint32 len = NS_StringGetData(*this, begin);
uint32_t len = NS_StringGetData(*this, begin);
if (end)
*end = *begin + len;
@@ -40,14 +40,14 @@ const nsAString::char_type*
nsAString::EndReading() const
{
const char_type *data;
PRUint32 len = NS_StringGetData(*this, &data);
uint32_t len = NS_StringGetData(*this, &data);
return data + len;
}
PRUint32
nsAString::BeginWriting(char_type **begin, char_type **end, PRUint32 newSize)
uint32_t
nsAString::BeginWriting(char_type **begin, char_type **end, uint32_t newSize)
{
PRUint32 len = NS_StringGetMutableData(*this, newSize, begin);
uint32_t len = NS_StringGetMutableData(*this, newSize, begin);
if (end)
*end = *begin + len;
@@ -55,7 +55,7 @@ nsAString::BeginWriting(char_type **begin, char_type **end, PRUint32 newSize)
}
nsAString::char_type*
nsAString::BeginWriting(PRUint32 aLen)
nsAString::BeginWriting(uint32_t aLen)
{
char_type *data;
NS_StringGetMutableData(*this, aLen, &data);
@@ -66,12 +66,12 @@ nsAString::char_type*
nsAString::EndWriting()
{
char_type *data;
PRUint32 len = NS_StringGetMutableData(*this, PR_UINT32_MAX, &data);
uint32_t len = NS_StringGetMutableData(*this, PR_UINT32_MAX, &data);
return data + len;
}
bool
nsAString::SetLength(PRUint32 aLen)
nsAString::SetLength(uint32_t aLen)
{
char_type *data;
NS_StringGetMutableData(*this, aLen, &data);
@@ -81,7 +81,7 @@ nsAString::SetLength(PRUint32 aLen)
void
nsAString::AssignLiteral(const char *aStr)
{
PRUint32 len = strlen(aStr);
uint32_t len = strlen(aStr);
PRUnichar *buf = BeginWriting(len);
if (!buf)
return;
@@ -93,9 +93,9 @@ nsAString::AssignLiteral(const char *aStr)
void
nsAString::AppendLiteral(const char *aASCIIStr)
{
PRUint32 appendLen = strlen(aASCIIStr);
uint32_t appendLen = strlen(aASCIIStr);
PRUint32 thisLen = Length();
uint32_t thisLen = Length();
PRUnichar *begin, *end;
BeginWriting(&begin, &end, appendLen + thisLen);
if (!begin)
@@ -143,7 +143,7 @@ nsAString::Trim(const char *aSet, bool aLeading, bool aTrailing)
NS_ASSERTION(aLeading || aTrailing, "Ineffective Trim");
const PRUnichar *start, *end;
PRUint32 cutLen;
uint32_t cutLen;
if (aLeading) {
BeginReading(&start, &end);
@@ -161,7 +161,7 @@ nsAString::Trim(const char *aSet, bool aLeading, bool aTrailing)
}
}
if (aTrailing) {
PRUint32 len = BeginReading(&start, &end);
uint32_t len = BeginReading(&start, &end);
--end;
for (cutLen = 0; end >= start; --end, ++cutLen) {
const char *test;
@@ -178,9 +178,9 @@ nsAString::Trim(const char *aSet, bool aLeading, bool aTrailing)
}
}
PRInt32
int32_t
nsAString::DefaultComparator(const char_type *a, const char_type *b,
PRUint32 len)
uint32_t len)
{
for (const char_type *end = a + len; a < end; ++a, ++b) {
if (*a == *b)
@@ -192,15 +192,15 @@ nsAString::DefaultComparator(const char_type *a, const char_type *b,
return 0;
}
PRInt32
int32_t
nsAString::Compare(const char_type *other, ComparatorFunc c) const
{
const char_type *cself;
PRUint32 selflen = NS_StringGetData(*this, &cself);
PRUint32 otherlen = NS_strlen(other);
PRUint32 comparelen = selflen <= otherlen ? selflen : otherlen;
uint32_t selflen = NS_StringGetData(*this, &cself);
uint32_t otherlen = NS_strlen(other);
uint32_t comparelen = selflen <= otherlen ? selflen : otherlen;
PRInt32 result = c(cself, other, comparelen);
int32_t result = c(cself, other, comparelen);
if (result == 0) {
if (selflen < otherlen)
return -1;
@@ -210,15 +210,15 @@ nsAString::Compare(const char_type *other, ComparatorFunc c) const
return result;
}
PRInt32
int32_t
nsAString::Compare(const self_type &other, ComparatorFunc c) const
{
const char_type *cself, *cother;
PRUint32 selflen = NS_StringGetData(*this, &cself);
PRUint32 otherlen = NS_StringGetData(other, &cother);
PRUint32 comparelen = selflen <= otherlen ? selflen : otherlen;
uint32_t selflen = NS_StringGetData(*this, &cself);
uint32_t otherlen = NS_StringGetData(other, &cother);
uint32_t comparelen = selflen <= otherlen ? selflen : otherlen;
PRInt32 result = c(cself, cother, comparelen);
int32_t result = c(cself, cother, comparelen);
if (result == 0) {
if (selflen < otherlen)
return -1;
@@ -232,8 +232,8 @@ bool
nsAString::Equals(const char_type *other, ComparatorFunc c) const
{
const char_type *cself;
PRUint32 selflen = NS_StringGetData(*this, &cself);
PRUint32 otherlen = NS_strlen(other);
uint32_t selflen = NS_StringGetData(*this, &cself);
uint32_t otherlen = NS_strlen(other);
if (selflen != otherlen)
return false;
@@ -246,8 +246,8 @@ nsAString::Equals(const self_type &other, ComparatorFunc c) const
{
const char_type *cself;
const char_type *cother;
PRUint32 selflen = NS_StringGetData(*this, &cself);
PRUint32 otherlen = NS_StringGetData(other, &cother);
uint32_t selflen = NS_StringGetData(*this, &cself);
uint32_t otherlen = NS_StringGetData(other, &cother);
if (selflen != otherlen)
return false;
@@ -287,18 +287,18 @@ nsAString::LowerCaseEqualsLiteral(const char *aASCIIString) const
return *aASCIIString == '\0';
}
PRInt32
nsAString::Find(const self_type& aStr, PRUint32 aOffset,
int32_t
nsAString::Find(const self_type& aStr, uint32_t aOffset,
ComparatorFunc c) const
{
const char_type *begin, *end;
PRUint32 selflen = BeginReading(&begin, &end);
uint32_t selflen = BeginReading(&begin, &end);
if (aOffset > selflen)
return -1;
const char_type *other;
PRUint32 otherlen = aStr.BeginReading(&other);
uint32_t otherlen = aStr.BeginReading(&other);
if (otherlen > selflen - aOffset)
return -1;
@@ -314,7 +314,7 @@ nsAString::Find(const self_type& aStr, PRUint32 aOffset,
}
static bool ns_strnmatch(const PRUnichar *aStr, const char* aSubstring,
PRUint32 aLen)
uint32_t aLen)
{
for (; aLen; ++aStr, ++aSubstring, --aLen) {
if (!NS_IsAscii(*aStr))
@@ -328,7 +328,7 @@ static bool ns_strnmatch(const PRUnichar *aStr, const char* aSubstring,
}
static bool ns_strnimatch(const PRUnichar *aStr, const char* aSubstring,
PRUint32 aLen)
uint32_t aLen)
{
for (; aLen; ++aStr, ++aSubstring, --aLen) {
if (!NS_IsAscii(*aStr))
@@ -341,19 +341,19 @@ static bool ns_strnimatch(const PRUnichar *aStr, const char* aSubstring,
return true;
}
PRInt32
nsAString::Find(const char *aStr, PRUint32 aOffset, bool aIgnoreCase) const
int32_t
nsAString::Find(const char *aStr, uint32_t aOffset, bool aIgnoreCase) const
{
bool (*match)(const PRUnichar*, const char*, PRUint32) =
bool (*match)(const PRUnichar*, const char*, uint32_t) =
aIgnoreCase ? ns_strnimatch : ns_strnmatch;
const char_type *begin, *end;
PRUint32 selflen = BeginReading(&begin, &end);
uint32_t selflen = BeginReading(&begin, &end);
if (aOffset > selflen)
return -1;
PRUint32 otherlen = strlen(aStr);
uint32_t otherlen = strlen(aStr);
if (otherlen > selflen - aOffset)
return -1;
@@ -369,19 +369,19 @@ nsAString::Find(const char *aStr, PRUint32 aOffset, bool aIgnoreCase) const
return -1;
}
PRInt32
nsAString::RFind(const self_type& aStr, PRInt32 aOffset, ComparatorFunc c) const
int32_t
nsAString::RFind(const self_type& aStr, int32_t aOffset, ComparatorFunc c) const
{
const char_type *begin, *end;
PRUint32 selflen = BeginReading(&begin, &end);
uint32_t selflen = BeginReading(&begin, &end);
const char_type *other;
PRUint32 otherlen = aStr.BeginReading(&other);
uint32_t otherlen = aStr.BeginReading(&other);
if (selflen < otherlen)
return -1;
if (aOffset < 0 || PRUint32(aOffset) > (selflen - otherlen))
if (aOffset < 0 || uint32_t(aOffset) > (selflen - otherlen))
end -= otherlen;
else
end = begin + aOffset;
@@ -393,20 +393,20 @@ nsAString::RFind(const self_type& aStr, PRInt32 aOffset, ComparatorFunc c) const
return -1;
}
PRInt32
nsAString::RFind(const char *aStr, PRInt32 aOffset, bool aIgnoreCase) const
int32_t
nsAString::RFind(const char *aStr, int32_t aOffset, bool aIgnoreCase) const
{
bool (*match)(const PRUnichar*, const char*, PRUint32) =
bool (*match)(const PRUnichar*, const char*, uint32_t) =
aIgnoreCase ? ns_strnimatch : ns_strnmatch;
const char_type *begin, *end;
PRUint32 selflen = BeginReading(&begin, &end);
PRUint32 otherlen = strlen(aStr);
uint32_t selflen = BeginReading(&begin, &end);
uint32_t otherlen = strlen(aStr);
if (selflen < otherlen)
return -1;
if (aOffset < 0 || PRUint32(aOffset) > (selflen - otherlen))
if (aOffset < 0 || uint32_t(aOffset) > (selflen - otherlen))
end -= otherlen;
else
end = begin + aOffset;
@@ -419,11 +419,11 @@ nsAString::RFind(const char *aStr, PRInt32 aOffset, bool aIgnoreCase) const
return -1;
}
PRInt32
nsAString::FindChar(char_type aChar, PRUint32 aOffset) const
int32_t
nsAString::FindChar(char_type aChar, uint32_t aOffset) const
{
const char_type *start, *end;
PRUint32 len = BeginReading(&start, &end);
uint32_t len = BeginReading(&start, &end);
if (aOffset > len)
return -1;
@@ -437,7 +437,7 @@ nsAString::FindChar(char_type aChar, PRUint32 aOffset) const
return -1;
}
PRInt32
int32_t
nsAString::RFindChar(char_type aChar) const
{
const PRUnichar *start, *end;
@@ -455,7 +455,7 @@ nsAString::RFindChar(char_type aChar) const
}
void
nsAString::AppendInt(int aInt, PRInt32 aRadix)
nsAString::AppendInt(int aInt, int32_t aRadix)
{
const char *fmt;
switch (aRadix) {
@@ -486,8 +486,8 @@ nsAString::AppendInt(int aInt, PRInt32 aRadix)
// Strings
#ifndef XPCOM_GLUE_AVOID_NSPR
PRInt32
nsAString::ToInteger(nsresult *aErrorCode, PRUint32 aRadix) const
int32_t
nsAString::ToInteger(nsresult *aErrorCode, uint32_t aRadix) const
{
NS_ConvertUTF16toUTF8 narrow(*this);
@@ -507,7 +507,7 @@ nsAString::ToInteger(nsresult *aErrorCode, PRUint32 aRadix) const
return 0;
}
PRInt32 result = 0;
int32_t result = 0;
if (PR_sscanf(narrow.get(), fmt, &result) == 1)
*aErrorCode = NS_OK;
else
@@ -519,10 +519,10 @@ nsAString::ToInteger(nsresult *aErrorCode, PRUint32 aRadix) const
// nsACString
PRUint32
uint32_t
nsACString::BeginReading(const char_type **begin, const char_type **end) const
{
PRUint32 len = NS_CStringGetData(*this, begin);
uint32_t len = NS_CStringGetData(*this, begin);
if (end)
*end = *begin + len;
@@ -541,14 +541,14 @@ const nsACString::char_type*
nsACString::EndReading() const
{
const char_type *data;
PRUint32 len = NS_CStringGetData(*this, &data);
uint32_t len = NS_CStringGetData(*this, &data);
return data + len;
}
PRUint32
nsACString::BeginWriting(char_type **begin, char_type **end, PRUint32 newSize)
uint32_t
nsACString::BeginWriting(char_type **begin, char_type **end, uint32_t newSize)
{
PRUint32 len = NS_CStringGetMutableData(*this, newSize, begin);
uint32_t len = NS_CStringGetMutableData(*this, newSize, begin);
if (end)
*end = *begin + len;
@@ -556,7 +556,7 @@ nsACString::BeginWriting(char_type **begin, char_type **end, PRUint32 newSize)
}
nsACString::char_type*
nsACString::BeginWriting(PRUint32 aLen)
nsACString::BeginWriting(uint32_t aLen)
{
char_type *data;
NS_CStringGetMutableData(*this, aLen, &data);
@@ -567,12 +567,12 @@ nsACString::char_type*
nsACString::EndWriting()
{
char_type *data;
PRUint32 len = NS_CStringGetMutableData(*this, PR_UINT32_MAX, &data);
uint32_t len = NS_CStringGetMutableData(*this, PR_UINT32_MAX, &data);
return data + len;
}
bool
nsACString::SetLength(PRUint32 aLen)
nsACString::SetLength(uint32_t aLen)
{
char_type *data;
NS_CStringGetMutableData(*this, aLen, &data);
@@ -617,7 +617,7 @@ nsACString::Trim(const char *aSet, bool aLeading, bool aTrailing)
NS_ASSERTION(aLeading || aTrailing, "Ineffective Trim");
const char *start, *end;
PRUint32 cutLen;
uint32_t cutLen;
if (aLeading) {
BeginReading(&start, &end);
@@ -635,7 +635,7 @@ nsACString::Trim(const char *aSet, bool aLeading, bool aTrailing)
}
}
if (aTrailing) {
PRUint32 len = BeginReading(&start, &end);
uint32_t len = BeginReading(&start, &end);
--end;
for (cutLen = 0; end >= start; --end, ++cutLen) {
const char *test;
@@ -652,22 +652,22 @@ nsACString::Trim(const char *aSet, bool aLeading, bool aTrailing)
}
}
PRInt32
int32_t
nsACString::DefaultComparator(const char_type *a, const char_type *b,
PRUint32 len)
uint32_t len)
{
return memcmp(a, b, len);
}
PRInt32
int32_t
nsACString::Compare(const char_type *other, ComparatorFunc c) const
{
const char_type *cself;
PRUint32 selflen = NS_CStringGetData(*this, &cself);
PRUint32 otherlen = strlen(other);
PRUint32 comparelen = selflen <= otherlen ? selflen : otherlen;
uint32_t selflen = NS_CStringGetData(*this, &cself);
uint32_t otherlen = strlen(other);
uint32_t comparelen = selflen <= otherlen ? selflen : otherlen;
PRInt32 result = c(cself, other, comparelen);
int32_t result = c(cself, other, comparelen);
if (result == 0) {
if (selflen < otherlen)
return -1;
@@ -677,15 +677,15 @@ nsACString::Compare(const char_type *other, ComparatorFunc c) const
return result;
}
PRInt32
int32_t
nsACString::Compare(const self_type &other, ComparatorFunc c) const
{
const char_type *cself, *cother;
PRUint32 selflen = NS_CStringGetData(*this, &cself);
PRUint32 otherlen = NS_CStringGetData(other, &cother);
PRUint32 comparelen = selflen <= otherlen ? selflen : otherlen;
uint32_t selflen = NS_CStringGetData(*this, &cself);
uint32_t otherlen = NS_CStringGetData(other, &cother);
uint32_t comparelen = selflen <= otherlen ? selflen : otherlen;
PRInt32 result = c(cself, cother, comparelen);
int32_t result = c(cself, cother, comparelen);
if (result == 0) {
if (selflen < otherlen)
return -1;
@@ -699,8 +699,8 @@ bool
nsACString::Equals(const char_type *other, ComparatorFunc c) const
{
const char_type *cself;
PRUint32 selflen = NS_CStringGetData(*this, &cself);
PRUint32 otherlen = strlen(other);
uint32_t selflen = NS_CStringGetData(*this, &cself);
uint32_t otherlen = strlen(other);
if (selflen != otherlen)
return false;
@@ -713,8 +713,8 @@ nsACString::Equals(const self_type &other, ComparatorFunc c) const
{
const char_type *cself;
const char_type *cother;
PRUint32 selflen = NS_CStringGetData(*this, &cself);
PRUint32 otherlen = NS_CStringGetData(other, &cother);
uint32_t selflen = NS_CStringGetData(*this, &cself);
uint32_t otherlen = NS_CStringGetData(other, &cother);
if (selflen != otherlen)
return false;
@@ -722,18 +722,18 @@ nsACString::Equals(const self_type &other, ComparatorFunc c) const
return c(cself, cother, selflen) == 0;
}
PRInt32
nsACString::Find(const self_type& aStr, PRUint32 aOffset,
int32_t
nsACString::Find(const self_type& aStr, uint32_t aOffset,
ComparatorFunc c) const
{
const char_type *begin, *end;
PRUint32 selflen = BeginReading(&begin, &end);
uint32_t selflen = BeginReading(&begin, &end);
if (aOffset > selflen)
return -1;
const char_type *other;
PRUint32 otherlen = aStr.BeginReading(&other);
uint32_t otherlen = aStr.BeginReading(&other);
if (otherlen > selflen - aOffset)
return -1;
@@ -748,17 +748,17 @@ nsACString::Find(const self_type& aStr, PRUint32 aOffset,
return -1;
}
PRInt32
int32_t
nsACString::Find(const char_type *aStr, ComparatorFunc c) const
{
return Find(aStr, strlen(aStr), c);
}
PRInt32
nsACString::Find(const char_type *aStr, PRUint32 aLen, ComparatorFunc c) const
int32_t
nsACString::Find(const char_type *aStr, uint32_t aLen, ComparatorFunc c) const
{
const char_type *begin, *end;
PRUint32 selflen = BeginReading(&begin, &end);
uint32_t selflen = BeginReading(&begin, &end);
if (aLen == 0) {
NS_WARNING("Searching for zero-length string.");
@@ -778,19 +778,19 @@ nsACString::Find(const char_type *aStr, PRUint32 aLen, ComparatorFunc c) const
return -1;
}
PRInt32
nsACString::RFind(const self_type& aStr, PRInt32 aOffset, ComparatorFunc c) const
int32_t
nsACString::RFind(const self_type& aStr, int32_t aOffset, ComparatorFunc c) const
{
const char_type *begin, *end;
PRUint32 selflen = BeginReading(&begin, &end);
uint32_t selflen = BeginReading(&begin, &end);
const char_type *other;
PRUint32 otherlen = aStr.BeginReading(&other);
uint32_t otherlen = aStr.BeginReading(&other);
if (selflen < otherlen)
return -1;
if (aOffset < 0 || PRUint32(aOffset) > (selflen - otherlen))
if (aOffset < 0 || uint32_t(aOffset) > (selflen - otherlen))
end -= otherlen;
else
end = begin + aOffset;
@@ -802,24 +802,24 @@ nsACString::RFind(const self_type& aStr, PRInt32 aOffset, ComparatorFunc c) cons
return -1;
}
PRInt32
int32_t
nsACString::RFind(const char_type *aStr, ComparatorFunc c) const
{
return RFind(aStr, strlen(aStr), c);
}
PRInt32
nsACString::RFind(const char_type *aStr, PRInt32 aLen, ComparatorFunc c) const
int32_t
nsACString::RFind(const char_type *aStr, int32_t aLen, ComparatorFunc c) const
{
const char_type *begin, *end;
PRUint32 selflen = BeginReading(&begin, &end);
uint32_t selflen = BeginReading(&begin, &end);
if (aLen <= 0) {
NS_WARNING("Searching for zero-length string.");
return -1;
}
if (PRUint32(aLen) > selflen)
if (uint32_t(aLen) > selflen)
return -1;
// We want to start searching otherlen characters before the end of the string
@@ -832,11 +832,11 @@ nsACString::RFind(const char_type *aStr, PRInt32 aLen, ComparatorFunc c) const
return -1;
}
PRInt32
nsACString::FindChar(char_type aChar, PRUint32 aOffset) const
int32_t
nsACString::FindChar(char_type aChar, uint32_t aOffset) const
{
const char_type *start, *end;
PRUint32 len = BeginReading(&start, &end);
uint32_t len = BeginReading(&start, &end);
if (aOffset > len)
return -1;
@@ -850,7 +850,7 @@ nsACString::FindChar(char_type aChar, PRUint32 aOffset) const
return -1;
}
PRInt32
int32_t
nsACString::RFindChar(char_type aChar) const
{
const char *start, *end;
@@ -865,7 +865,7 @@ nsACString::RFindChar(char_type aChar) const
}
void
nsACString::AppendInt(int aInt, PRInt32 aRadix)
nsACString::AppendInt(int aInt, int32_t aRadix)
{
const char *fmt;
switch (aRadix) {
@@ -894,8 +894,8 @@ nsACString::AppendInt(int aInt, PRInt32 aRadix)
}
#ifndef XPCOM_GLUE_AVOID_NSPR
PRInt32
nsACString::ToInteger(nsresult *aErrorCode, PRUint32 aRadix) const
int32_t
nsACString::ToInteger(nsresult *aErrorCode, uint32_t aRadix) const
{
const char *fmt;
switch (aRadix) {
@@ -913,7 +913,7 @@ nsACString::ToInteger(nsresult *aErrorCode, PRUint32 aRadix) const
return 0;
}
PRInt32 result = 0;
int32_t result = 0;
if (PR_sscanf(nsCString(*this).get(), fmt, &result) == 1)
*aErrorCode = NS_OK;
else
@@ -926,10 +926,10 @@ nsACString::ToInteger(nsresult *aErrorCode, PRUint32 aRadix) const
// Substrings
nsDependentSubstring::nsDependentSubstring(const abstract_string_type& aStr,
PRUint32 aStartPos)
uint32_t aStartPos)
{
const PRUnichar* data;
PRUint32 len = NS_StringGetData(aStr, &data);
uint32_t len = NS_StringGetData(aStr, &data);
if (aStartPos > len)
aStartPos = len;
@@ -940,11 +940,11 @@ nsDependentSubstring::nsDependentSubstring(const abstract_string_type& aStr,
}
nsDependentSubstring::nsDependentSubstring(const abstract_string_type& aStr,
PRUint32 aStartPos,
PRUint32 aLength)
uint32_t aStartPos,
uint32_t aLength)
{
const PRUnichar* data;
PRUint32 len = NS_StringGetData(aStr, &data);
uint32_t len = NS_StringGetData(aStr, &data);
if (aStartPos > len)
aStartPos = len;
@@ -958,10 +958,10 @@ nsDependentSubstring::nsDependentSubstring(const abstract_string_type& aStr,
}
nsDependentCSubstring::nsDependentCSubstring(const abstract_string_type& aStr,
PRUint32 aStartPos)
uint32_t aStartPos)
{
const char* data;
PRUint32 len = NS_CStringGetData(aStr, &data);
uint32_t len = NS_CStringGetData(aStr, &data);
if (aStartPos > len)
aStartPos = len;
@@ -972,11 +972,11 @@ nsDependentCSubstring::nsDependentCSubstring(const abstract_string_type& aStr,
}
nsDependentCSubstring::nsDependentCSubstring(const abstract_string_type& aStr,
PRUint32 aStartPos,
PRUint32 aLength)
uint32_t aStartPos,
uint32_t aLength)
{
const char* data;
PRUint32 len = NS_CStringGetData(aStr, &data);
uint32_t len = NS_CStringGetData(aStr, &data);
if (aStartPos > len)
aStartPos = len;
@@ -1003,7 +1003,7 @@ void
CompressWhitespace(nsAString& aString)
{
PRUnichar *start;
PRUint32 len = NS_StringGetMutableData(aString, PR_UINT32_MAX, &start);
uint32_t len = NS_StringGetMutableData(aString, PR_UINT32_MAX, &start);
PRUnichar *end = start + len;
PRUnichar *from = start, *to = start;
@@ -1037,11 +1037,11 @@ CompressWhitespace(nsAString& aString)
aString.SetLength(to - start);
}
PRUint32
uint32_t
ToLowerCase(nsACString& aStr)
{
char *begin, *end;
PRUint32 len = aStr.BeginWriting(&begin, &end);
uint32_t len = aStr.BeginWriting(&begin, &end);
for (; begin < end; ++begin) {
*begin = NS_ToLower(*begin);
@@ -1050,11 +1050,11 @@ ToLowerCase(nsACString& aStr)
return len;
}
PRUint32
uint32_t
ToUpperCase(nsACString& aStr)
{
char *begin, *end;
PRUint32 len = aStr.BeginWriting(&begin, &end);
uint32_t len = aStr.BeginWriting(&begin, &end);
for (; begin < end; ++begin) {
*begin = NS_ToUpper(*begin);
@@ -1063,11 +1063,11 @@ ToUpperCase(nsACString& aStr)
return len;
}
PRUint32
uint32_t
ToLowerCase(const nsACString& aSrc, nsACString& aDest)
{
const char *begin, *end;
PRUint32 len = aSrc.BeginReading(&begin, &end);
uint32_t len = aSrc.BeginReading(&begin, &end);
char *dest;
NS_CStringGetMutableData(aDest, len, &dest);
@@ -1079,11 +1079,11 @@ ToLowerCase(const nsACString& aSrc, nsACString& aDest)
return len;
}
PRUint32
uint32_t
ToUpperCase(const nsACString& aSrc, nsACString& aDest)
{
const char *begin, *end;
PRUint32 len = aSrc.BeginReading(&begin, &end);
uint32_t len = aSrc.BeginReading(&begin, &end);
char *dest;
NS_CStringGetMutableData(aDest, len, &dest);
@@ -1095,9 +1095,9 @@ ToUpperCase(const nsACString& aSrc, nsACString& aDest)
return len;
}
PRInt32
int32_t
CaseInsensitiveCompare(const char *a, const char *b,
PRUint32 len)
uint32_t len)
{
for (const char *aend = a + len; a < aend; ++a, ++b) {
char la = NS_ToLower(*a);
@@ -1116,13 +1116,13 @@ bool
ParseString(const nsACString& aSource, char aDelimiter,
nsTArray<nsCString>& aArray)
{
PRInt32 start = 0;
PRInt32 end = aSource.Length();
int32_t start = 0;
int32_t end = aSource.Length();
PRUint32 oldLength = aArray.Length();
uint32_t oldLength = aArray.Length();
for (;;) {
PRInt32 delimiter = aSource.FindChar(aDelimiter, start);
int32_t delimiter = aSource.FindChar(aDelimiter, start);
if (delimiter < 0) {
delimiter = end;
}