Bug 579517 - Part 1: Automated conversion of NSPR numeric types to stdint types in Gecko; r=bsmedberg
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:
@@ -143,7 +143,7 @@ void LogMessage(const char* aMsg, ...)
|
||||
}
|
||||
|
||||
void LogMessageWithContext(FileLocation &aFile,
|
||||
PRUint32 aLineNumber, const char* aMsg, ...)
|
||||
uint32_t aLineNumber, const char* aMsg, ...)
|
||||
{
|
||||
va_list args;
|
||||
va_start(args, aMsg);
|
||||
@@ -316,7 +316,7 @@ CheckVersionFlag(const nsString& aFlag, const nsString& aData,
|
||||
return true;
|
||||
}
|
||||
|
||||
PRUint32 comparison;
|
||||
uint32_t comparison;
|
||||
nsAutoString testdata;
|
||||
|
||||
switch (aData[aFlag.Length()]) {
|
||||
@@ -355,7 +355,7 @@ CheckVersionFlag(const nsString& aFlag, const nsString& aData,
|
||||
return false;
|
||||
|
||||
if (aResult != eOK) {
|
||||
PRInt32 c = mozilla::CompareVersions(NS_ConvertUTF16toUTF8(aValue).get(),
|
||||
int32_t c = mozilla::CompareVersions(NS_ConvertUTF16toUTF8(aValue).get(),
|
||||
NS_ConvertUTF16toUTF8(testdata).get());
|
||||
if ((c == 0 && comparison & COMPARE_EQ) ||
|
||||
(c < 0 && comparison & COMPARE_LT) ||
|
||||
@@ -482,7 +482,7 @@ ParseManifest(NSLocationType type, FileLocation &file, char* buf, bool aChromeOn
|
||||
|
||||
char *token;
|
||||
char *newline = buf;
|
||||
PRUint32 line = 0;
|
||||
uint32_t line = 0;
|
||||
|
||||
// outer loop tokenizes by newline
|
||||
while (*newline) {
|
||||
@@ -647,7 +647,7 @@ ParseManifest(NSLocationType type, FileLocation &file, char* buf, bool aChromeOn
|
||||
}
|
||||
}
|
||||
|
||||
for (PRUint32 i = 0; i < contracts.Length(); ++i) {
|
||||
for (uint32_t i = 0; i < contracts.Length(); ++i) {
|
||||
CachedDirective& d = contracts[i];
|
||||
nsComponentManagerImpl::gComponentManager->ManifestContract
|
||||
(mgrcx, d.lineno, d.argv);
|
||||
|
||||
Reference in New Issue
Block a user