wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 1197309 - remove PR_snprintf calls in intl/; r=froydnj

Browse Source
This commit is contained in:
Aniket Vyas 2015-10-15 21:43:53 -04:00
parent eae5aaad82
commit a23d5b7f69
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
intl/locale/unix/nsPosixLocale.cpp
View File

@ -6,7 +6,7 @@
#include "nscore.h"
#include "nsString.h"
#include "nsPosixLocale.h"
#include "prprf.h"
#include "mozilla/Snprintf.h"
#include "plstr.h"
#include "nsReadableUtils.h"
@ -31,18 +31,18 @@ nsPosixLocale::GetPlatformLocale(const nsAString& locale, nsACString& posixLocal
if (*country_code) {
if (*extra) {
PR_snprintf(posix_locale,sizeof(posix_locale),"%s_%s.%s",lang_code,country_code,extra);
snprintf_literal(posix_locale,"%s_%s.%s",lang_code,country_code,extra);
}
else {
PR_snprintf(posix_locale,sizeof(posix_locale),"%s_%s",lang_code,country_code);
snprintf_literal(posix_locale,"%s_%s",lang_code,country_code);
}
}
else {
if (*extra) {
PR_snprintf(posix_locale,sizeof(posix_locale),"%s.%s",lang_code,extra);
snprintf_literal(posix_locale,"%s.%s",lang_code,extra);
}
else {
PR_snprintf(posix_locale,sizeof(posix_locale),"%s",lang_code);
snprintf_literal(posix_locale,"%s",lang_code);
}
}
@ -80,10 +80,10 @@ nsPosixLocale::GetXPLocale(const char* posixLocale, nsAString& locale)
}
if (*country_code) {
PR_snprintf(posix_locale,sizeof(posix_locale),"%s-%s",lang_code,country_code);
snprintf_literal(posix_locale,"%s-%s",lang_code,country_code);
}
else {
PR_snprintf(posix_locale,sizeof(posix_locale),"%s",lang_code);
snprintf_literal(posix_locale,"%s",lang_code);
}
CopyASCIItoUTF16(nsDependentCString(posix_locale), locale);

10
intl/unicharutil/nsSaveAsCharset.cpp
View File

@ -6,7 +6,7 @@
#include "prmem.h"
#include "prprf.h"
#include "mozilla/Snprintf.h"
#include "nsSaveAsCharset.h"
#include "nsWhitespaceTokenizer.h"
#include "nsIUnicodeEncoder.h"
@ -304,15 +304,15 @@ nsSaveAsCharset::DoConversionFallBack(uint32_t inUCS4, char *outString, int32_t
break;
case attr_FallbackEscapeU:
if (inUCS4 & 0xff0000)
rv = (PR_snprintf(outString, bufferLength, "\\u%.6x", inUCS4) > 0) ? NS_OK : NS_ERROR_FAILURE;
rv = (snprintf(outString, bufferLength, "\\u%.6x", inUCS4) > 0) ? NS_OK : NS_ERROR_FAILURE;
else
rv = (PR_snprintf(outString, bufferLength, "\\u%.4x", inUCS4) > 0) ? NS_OK : NS_ERROR_FAILURE;
rv = (snprintf(outString, bufferLength, "\\u%.4x", inUCS4) > 0) ? NS_OK : NS_ERROR_FAILURE;
break;
case attr_FallbackDecimalNCR:
rv = ( PR_snprintf(outString, bufferLength, "&#%u;", inUCS4) > 0) ? NS_OK : NS_ERROR_FAILURE;
rv = (snprintf(outString, bufferLength, "&#%u;", inUCS4) > 0) ? NS_OK : NS_ERROR_FAILURE;
break;
case attr_FallbackHexNCR:
rv = (PR_snprintf(outString, bufferLength, "&#x%x;", inUCS4) > 0) ? NS_OK : NS_ERROR_FAILURE;
rv = (snprintf(outString, bufferLength, "&#x%x;", inUCS4) > 0) ? NS_OK : NS_ERROR_FAILURE;
break;
case attr_FallbackNone:
rv = NS_OK;