Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-08 19:04:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1060419 - make ManifestParser use Printf.h, r=froydnj

Browse Source 
MozReview-Commit-ID: HBOOr5WScvU

--HG--
extra : rebase_source : 08a020f6c95cd662000e2ade4bcbae7f62bea165
This commit is contained in:
Tom Tromey 2016-12-15 20:13:08 -07:00
parent 5f8f360823
commit 7c2695d760
2 changed files with 16 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
xpcom/components/ManifestParser.cpp
View File

@ -5,13 +5,14 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
#include "mozilla/ArrayUtils.h"
#include "mozilla/Printf.h"
#include "mozilla/UniquePtr.h"
#include "ManifestParser.h"
#include <string.h>
#include "prio.h"
#include "prprf.h"
#if defined(XP_WIN)
#include <windows.h>
#elif defined(MOZ_WIDGET_COCOA)
@ -136,22 +137,15 @@ IsNewline(char aChar)
}
namespace {
struct AutoPR_smprintf_free
struct SmprintfFreePolicy
{
explicit AutoPR_smprintf_free(char* aBuf) : mBuf(aBuf) {}
~AutoPR_smprintf_free()
{
if (mBuf) {
PR_smprintf_free(mBuf);
}
void operator()(char* ptr) {
mozilla::SmprintfFree(ptr);
}
operator char*() const { return mBuf; }
char* mBuf;
};
typedef mozilla::UniquePtr<char, SmprintfFreePolicy> SmprintfPointer;
} // namespace
/**
@ -173,11 +167,11 @@ LogMessage(const char* aMsg, ...)
va_list args;
va_start(args, aMsg);
AutoPR_smprintf_free formatted(PR_vsmprintf(aMsg, args));
SmprintfPointer formatted(mozilla::Vsmprintf(aMsg, args));
va_end(args);
nsCOMPtr<nsIConsoleMessage> error =
new nsConsoleMessage(NS_ConvertUTF8toUTF16(formatted).get());
new nsConsoleMessage(NS_ConvertUTF8toUTF16(formatted.get()).get());
console->LogMessage(error);
}
@ -191,7 +185,7 @@ LogMessageWithContext(FileLocation& aFile,
{
va_list args;
va_start(args, aMsg);
AutoPR_smprintf_free formatted(PR_vsmprintf(aMsg, args));
SmprintfPointer formatted(mozilla::Vsmprintf(aMsg, args));
va_end(args);
if (!formatted) {
return;
@ -210,7 +204,7 @@ LogMessageWithContext(FileLocation& aFile,
// This can happen early in component registration. Fall back to a
// generic console message.
LogMessage("Warning: in '%s', line %i: %s", file.get(),
aLineNumber, (char*)formatted);
aLineNumber, formatted.get());
return;
}
@ -220,7 +214,7 @@ LogMessageWithContext(FileLocation& aFile,
return;
}
nsresult rv = error->Init(NS_ConvertUTF8toUTF16(formatted),
nsresult rv = error->Init(NS_ConvertUTF8toUTF16(formatted.get()),
NS_ConvertUTF8toUTF16(file), EmptyString(),
aLineNumber, 0, nsIScriptError::warningFlag,
"chrome registration");

6
xpcom/components/ManifestParser.h
View File

@ -9,14 +9,16 @@
#include "nsComponentManager.h"
#include "nsChromeRegistry.h"
#include "mozilla/Attributes.h"
#include "mozilla/FileLocation.h"
void ParseManifest(NSLocationType aType, mozilla::FileLocation& aFile,
char* aBuf, bool aChromeOnly, bool aXPTOnly = false);
void LogMessage(const char* aMsg, ...);
void LogMessage(const char* aMsg, ...) MOZ_FORMAT_PRINTF(1, 2);
void LogMessageWithContext(mozilla::FileLocation& aFile,
uint32_t aLineNumber, const char* aMsg, ...);
uint32_t aLineNumber, const char* aMsg, ...)
MOZ_FORMAT_PRINTF(3, 4);
#endif // ManifestParser_h