Bug 927728 - Part 1: Replace PRUnichar with char16_t; r=roc
This patch was automatically generated by the following script:
#!/bin/bash
# Command to convert PRUnichar to char16_t
function convert() {
echo "Converting $1 to $2..."
find . ! -wholename "*nsprpub*" \
! -wholename "*security/nss*" \
! -wholename "*modules/libmar*" \
! -wholename "*/.hg*" \
! -wholename "obj-ff-dbg*" \
! -name prtypes.h \
! -name Char16.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 PRUnichar char16_t
This commit is contained in:
@@ -8,7 +8,7 @@
|
||||
#include "nsHtml5Portability.h"
|
||||
|
||||
nsIAtom*
|
||||
nsHtml5Portability::newLocalNameFromBuffer(PRUnichar* buf, int32_t offset, int32_t length, nsHtml5AtomTable* interner)
|
||||
nsHtml5Portability::newLocalNameFromBuffer(char16_t* buf, int32_t offset, int32_t length, nsHtml5AtomTable* interner)
|
||||
{
|
||||
NS_ASSERTION(!offset, "The offset should always be zero here.");
|
||||
NS_ASSERTION(interner, "Didn't get an atom service.");
|
||||
@@ -16,7 +16,7 @@ nsHtml5Portability::newLocalNameFromBuffer(PRUnichar* buf, int32_t offset, int32
|
||||
}
|
||||
|
||||
nsString*
|
||||
nsHtml5Portability::newStringFromBuffer(PRUnichar* buf, int32_t offset, int32_t length)
|
||||
nsHtml5Portability::newStringFromBuffer(char16_t* buf, int32_t offset, int32_t length)
|
||||
{
|
||||
return new nsString(buf + offset, length);
|
||||
}
|
||||
@@ -42,23 +42,23 @@ nsHtml5Portability::newStringFromString(nsString* string) {
|
||||
return newStr;
|
||||
}
|
||||
|
||||
jArray<PRUnichar,int32_t>
|
||||
jArray<char16_t,int32_t>
|
||||
nsHtml5Portability::newCharArrayFromLocal(nsIAtom* local)
|
||||
{
|
||||
nsAutoString temp;
|
||||
local->ToString(temp);
|
||||
int32_t len = temp.Length();
|
||||
jArray<PRUnichar,int32_t> arr = jArray<PRUnichar,int32_t>::newJArray(len);
|
||||
memcpy(arr, temp.BeginReading(), len * sizeof(PRUnichar));
|
||||
jArray<char16_t,int32_t> arr = jArray<char16_t,int32_t>::newJArray(len);
|
||||
memcpy(arr, temp.BeginReading(), len * sizeof(char16_t));
|
||||
return arr;
|
||||
}
|
||||
|
||||
jArray<PRUnichar,int32_t>
|
||||
jArray<char16_t,int32_t>
|
||||
nsHtml5Portability::newCharArrayFromString(nsString* string)
|
||||
{
|
||||
int32_t len = string->Length();
|
||||
jArray<PRUnichar,int32_t> arr = jArray<PRUnichar,int32_t>::newJArray(len);
|
||||
memcpy(arr, string->BeginReading(), len * sizeof(PRUnichar));
|
||||
jArray<char16_t,int32_t> arr = jArray<char16_t,int32_t>::newJArray(len);
|
||||
memcpy(arr, string->BeginReading(), len * sizeof(char16_t));
|
||||
return arr;
|
||||
}
|
||||
|
||||
@@ -82,7 +82,7 @@ nsHtml5Portability::releaseString(nsString* str)
|
||||
}
|
||||
|
||||
bool
|
||||
nsHtml5Portability::localEqualsBuffer(nsIAtom* local, PRUnichar* buf, int32_t offset, int32_t length)
|
||||
nsHtml5Portability::localEqualsBuffer(nsIAtom* local, char16_t* buf, int32_t offset, int32_t length)
|
||||
{
|
||||
return local->Equals(nsDependentSubstring(buf + offset, buf + offset + length));
|
||||
}
|
||||
@@ -94,15 +94,15 @@ nsHtml5Portability::lowerCaseLiteralIsPrefixOfIgnoreAsciiCaseString(const char*
|
||||
return false;
|
||||
}
|
||||
const char* litPtr = lowerCaseLiteral;
|
||||
const PRUnichar* strPtr = string->BeginReading();
|
||||
const PRUnichar* end = string->EndReading();
|
||||
PRUnichar litChar;
|
||||
const char16_t* strPtr = string->BeginReading();
|
||||
const char16_t* end = string->EndReading();
|
||||
char16_t litChar;
|
||||
while ((litChar = *litPtr)) {
|
||||
NS_ASSERTION(!(litChar >= 'A' && litChar <= 'Z'), "Literal isn't in lower case.");
|
||||
if (strPtr == end) {
|
||||
return false;
|
||||
}
|
||||
PRUnichar strChar = *strPtr;
|
||||
char16_t strChar = *strPtr;
|
||||
if (strChar >= 'A' && strChar <= 'Z') {
|
||||
strChar += 0x20;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user