зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1418847 - Hardcode the value reader and error reporter in Parser. r=glandium
In practice we always use the same functions for these purposes. MozReview-Commit-ID: 4Be9pRhUeff --HG-- extra : rebase_source : 3dfafd9479371d3a47ec263a66942ddbfbefdb46
This commit is contained in:
Nicholas Nethercote
Родитель
eaa4ad1134
Коммит
40c44bbf9d
|
|
@ -1029,61 +1029,15 @@ NotifyCallbacks(const char* aPrefName)
|
|||
}
|
||||
}
|
||||
|
||||
// The callback function of the prefs parser.
|
||||
static void
|
||||
PREF_ReaderCallback(void* aClosure,
|
||||
const char* aPref,
|
||||
PrefValue aValue,
|
||||
PrefType aType,
|
||||
bool aIsDefault,
|
||||
bool aIsSticky)
|
||||
{
|
||||
uint32_t flags = 0;
|
||||
if (aIsDefault) {
|
||||
flags |= kPrefSetDefault;
|
||||
if (aIsSticky) {
|
||||
flags |= kPrefSticky;
|
||||
}
|
||||
} else {
|
||||
flags |= kPrefForceSet;
|
||||
}
|
||||
pref_SetPref(aPref, aValue, aType, flags);
|
||||
}
|
||||
|
||||
//===========================================================================
|
||||
// Prefs parsing
|
||||
//===========================================================================
|
||||
|
||||
// Callback function used to notify consumer of preference name value pairs.
|
||||
// The pref name and value must be copied by the implementor of the callback
|
||||
// if they are needed beyond the scope of the callback function.
|
||||
//
|
||||
// |aClosure| is user data passed previously to Parser's constructor.
|
||||
// |aPrefName| is the preference name.
|
||||
// |aValue| is the preference value.
|
||||
// |aType| is the preference type.
|
||||
// |aIsDefault| indicates if it's a default preference.
|
||||
// |aIsSticky| indicates if it's a sticky preference.
|
||||
typedef void (*PrefReader)(void* aClosure,
|
||||
const char* aPrefName,
|
||||
PrefValue aValue,
|
||||
PrefType aType,
|
||||
bool aIsDefault,
|
||||
bool aIsSticky);
|
||||
|
||||
// Report any errors or warnings we encounter during parsing.
|
||||
typedef void (*ParseErrorReporter)(const char* aMessage,
|
||||
int aLine,
|
||||
bool aError);
|
||||
|
||||
class Parser
|
||||
{
|
||||
public:
|
||||
Parser(PrefReader aReader, ParseErrorReporter aReporter, void* aClosure)
|
||||
: mReader(aReader)
|
||||
, mClosure(aClosure)
|
||||
, mReporter(aReporter)
|
||||
, mState()
|
||||
Parser()
|
||||
: mState()
|
||||
, mNextState()
|
||||
, mStrMatch()
|
||||
, mStrIndex()
|
||||
|
|
@ -1107,6 +1061,12 @@ public:
|
|||
|
||||
bool GrowBuf();
|
||||
|
||||
void HandleValue(const char* aPrefName,
|
||||
PrefType aType,
|
||||
PrefValue aValue,
|
||||
bool aIsDefault,
|
||||
bool aIsSticky);
|
||||
|
||||
void ReportProblem(const char* aMessage, int aLine, bool aError);
|
||||
|
||||
private:
|
||||
|
|
@ -1142,25 +1102,22 @@ private:
|
|||
static constexpr const char* kTrue = "true";
|
||||
static constexpr const char* kFalse = "false";
|
||||
|
||||
PrefReader mReader; // called for each preference
|
||||
void* mClosure; // closure data for mReader
|
||||
ParseErrorReporter mReporter; // called for warnings/errors
|
||||
State mState; // current parse state
|
||||
State mNextState; // sometimes used...
|
||||
const char* mStrMatch; // string to match
|
||||
int mStrIndex; // next char of smatch to check;
|
||||
// also, counter in \u parsing
|
||||
char16_t mUtf16[2]; // parsing UTF16 (\u) escape
|
||||
int mEscLen; // length in mEscTmp
|
||||
char mEscTmp[6]; // raw escape to put back if err
|
||||
char mQuoteChar; // char delimiter for quotations
|
||||
char* mLb; // line buffer (only allocation)
|
||||
char* mLbCur; // line buffer cursor
|
||||
char* mLbEnd; // line buffer end
|
||||
char* mVb; // value buffer (ptr into mLb)
|
||||
Maybe<PrefType> mVtype; // pref value type
|
||||
bool mIsDefault; // true if (default) pref
|
||||
bool mIsSticky; // true if (sticky) pref
|
||||
State mState; // current parse state
|
||||
State mNextState; // sometimes used...
|
||||
const char* mStrMatch; // string to match
|
||||
int mStrIndex; // next char of smatch to check;
|
||||
// also, counter in \u parsing
|
||||
char16_t mUtf16[2]; // parsing UTF16 (\u) escape
|
||||
int mEscLen; // length in mEscTmp
|
||||
char mEscTmp[6]; // raw escape to put back if err
|
||||
char mQuoteChar; // char delimiter for quotations
|
||||
char* mLb; // line buffer (only allocation)
|
||||
char* mLbCur; // line buffer cursor
|
||||
char* mLbEnd; // line buffer end
|
||||
char* mVb; // value buffer (ptr into mLb)
|
||||
Maybe<PrefType> mVtype; // pref value type
|
||||
bool mIsDefault; // true if (default) pref
|
||||
bool mIsSticky; // true if (sticky) pref
|
||||
};
|
||||
|
||||
// This function will increase the size of the buffer owned by the given pref
|
||||
|
|
@ -1202,17 +1159,40 @@ Parser::GrowBuf()
|
|||
return true;
|
||||
}
|
||||
|
||||
void
|
||||
Parser::HandleValue(const char* aPrefName,
|
||||
PrefType aType,
|
||||
PrefValue aValue,
|
||||
bool aIsDefault,
|
||||
bool aIsSticky)
|
||||
{
|
||||
uint32_t flags = 0;
|
||||
if (aIsDefault) {
|
||||
flags |= kPrefSetDefault;
|
||||
if (aIsSticky) {
|
||||
flags |= kPrefSticky;
|
||||
}
|
||||
} else {
|
||||
flags |= kPrefForceSet;
|
||||
}
|
||||
pref_SetPref(aPrefName, aValue, aType, flags);
|
||||
}
|
||||
|
||||
// Report an error or a warning. If not specified, just dump to stderr.
|
||||
void
|
||||
Parser::ReportProblem(const char* aMessage, int aLine, bool aError)
|
||||
{
|
||||
if (mReporter) {
|
||||
mReporter(aMessage, aLine, aError);
|
||||
nsPrintfCString message("** Preference parsing %s (line %d) = %s **\n",
|
||||
(aError ? "error" : "warning"),
|
||||
aLine,
|
||||
aMessage);
|
||||
nsresult rv;
|
||||
nsCOMPtr<nsIConsoleService> console =
|
||||
do_GetService("@mozilla.org/consoleservice;1", &rv);
|
||||
if (NS_SUCCEEDED(rv)) {
|
||||
console->LogStringMessage(NS_ConvertUTF8toUTF16(message).get());
|
||||
} else {
|
||||
printf_stderr("**** Preference parsing %s (line %d) = %s **\n",
|
||||
(aError ? "error" : "warning"),
|
||||
aLine,
|
||||
aMessage);
|
||||
printf_stderr("%s", message.get());
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -1647,7 +1627,7 @@ Parser::Parse(const char* aBuf, int aBufLen)
|
|||
}
|
||||
|
||||
// We've extracted a complete name/value pair.
|
||||
mReader(mClosure, mLb, value, *mVtype, mIsDefault, mIsSticky);
|
||||
HandleValue(mLb, *mVtype, value, mIsDefault, mIsSticky);
|
||||
|
||||
state = State::eInit;
|
||||
} else if (c == '/') {
|
||||
|
|
@ -1844,8 +1824,6 @@ public:
|
|||
|
||||
size_t SizeOfIncludingThis(MallocSizeOf aMallocSizeOf) const;
|
||||
|
||||
static void ReportToConsole(const nsAString& aMessage);
|
||||
|
||||
private:
|
||||
// Helper class for either returning a raw cstring or nsCString.
|
||||
typedef mozilla::Variant<const char*, const nsCString> PrefNameBase;
|
||||
|
|
@ -2385,20 +2363,6 @@ nsPrefBranch::CheckSanityOfStringLength(const char* aPrefName,
|
|||
return NS_OK;
|
||||
}
|
||||
|
||||
/* static */ void
|
||||
nsPrefBranch::ReportToConsole(const nsAString& aMessage)
|
||||
{
|
||||
nsresult rv;
|
||||
nsCOMPtr<nsIConsoleService> console =
|
||||
do_GetService("@mozilla.org/consoleservice;1", &rv);
|
||||
if (NS_FAILED(rv)) {
|
||||
return;
|
||||
}
|
||||
|
||||
nsAutoString message(aMessage);
|
||||
console->LogStringMessage(message.get());
|
||||
}
|
||||
|
||||
NS_IMETHODIMP
|
||||
nsPrefBranch::SetComplexValue(const char* aPrefName,
|
||||
const nsIID& aType,
|
||||
|
|
@ -3192,16 +3156,6 @@ AssertNotAlreadyCached(const char* aPrefType, const char* aPref, void* aPtr)
|
|||
}
|
||||
#endif
|
||||
|
||||
static void
|
||||
ReportToConsole(const char* aMessage, int aLine, bool aError)
|
||||
{
|
||||
nsPrintfCString message("** Preference parsing %s (line %d) = %s **\n",
|
||||
(aError ? "error" : "warning"),
|
||||
aLine,
|
||||
aMessage);
|
||||
nsPrefBranch::ReportToConsole(NS_ConvertUTF8toUTF16(message.get()));
|
||||
}
|
||||
|
||||
struct PrefsSizes
|
||||
{
|
||||
PrefsSizes()
|
||||
|
|
@ -4102,7 +4056,7 @@ openPrefFile(nsIFile* aFile)
|
|||
nsCString data;
|
||||
MOZ_TRY_VAR(data, URLPreloader::ReadFile(aFile));
|
||||
|
||||
Parser parser(PREF_ReaderCallback, ReportToConsole, nullptr);
|
||||
Parser parser;
|
||||
if (!parser.Parse(data.get(), data.Length())) {
|
||||
return NS_ERROR_FILE_CORRUPTED;
|
||||
}
|
||||
|
|
@ -4274,7 +4228,7 @@ pref_ReadPrefFromJar(nsZipArchive* aJarReader, const char* aName)
|
|||
MOZ_TRY_VAR(manifest,
|
||||
URLPreloader::ReadZip(aJarReader, nsDependentCString(aName)));
|
||||
|
||||
Parser parser(PREF_ReaderCallback, ReportToConsole, nullptr);
|
||||
Parser parser;
|
||||
parser.Parse(manifest.get(), manifest.Length());
|
||||
|
||||
return NS_OK;
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче