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

Bug 1197316 - Remove PR_snprintf calls in xpcom/. r=froydnj

Browse Source
This commit is contained in:
Miko Mynttinen
2015-08-22 17:57:52 -07:00
parent d232257964
commit 7ac3faa6c3
4 changed files with 44 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
xpcom/threads/ThreadStackHelper.cpp
View File

@@ -9,7 +9,6 @@
#include "nsJSPrincipals.h"
#include "nsScriptSecurityManager.h"
#include "jsfriendapi.h"
#include "prprf.h"
#ifdef MOZ_THREADSTACKHELPER_NATIVE
#include "shared-libraries.h"
#endif
@@ -21,6 +20,7 @@
#include "mozilla/Scoped.h"
#include "mozilla/UniquePtr.h"
#include "mozilla/MemoryChecking.h"
#include "mozilla/Snprintf.h"
#ifdef MOZ_THREADSTACKHELPER_NATIVE
#include "google_breakpad/processor/call_stack.h"
@@ -464,12 +464,12 @@ ThreadStackHelper::GetNativeStack(Stack& aStack)
char buffer[0x100];
size_t len = 0;
if (!frame.function_name.empty()) {
len = PR_snprintf(buffer, sizeof(buffer), "%s:%s",
module_name, frame.function_name.c_str());
len = snprintf_literal(buffer, "%s:%s",
module_name, frame.function_name.c_str());
} else {
len = PR_snprintf(buffer, sizeof(buffer), "%s:0x%p",
module_name, (intptr_t)
(frame.instruction - frame.module->base_address()));
len = snprintf_literal(buffer, "%s:0x%p", module_name,
(intptr_t)(frame.instruction -
frame.module->base_address()));
}
if (len) {
aStack.AppendViaBuffer(buffer, len);
@@ -619,7 +619,7 @@ ThreadStackHelper::AppendJSEntry(const volatile StackEntry* aEntry,
}
}
size_t len = PR_snprintf(buffer, sizeof(buffer), "%s:%u", basename, lineno);
size_t len = snprintf_literal(buffer, "%s:%u", basename, lineno);
if (len < sizeof(buffer)) {
if (mStackToFill->IsSameAsEntry(aPrevLabel, buffer)) {
return aPrevLabel;