mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Bug 1418846 - Remove PrefType::Invalid. r=glandium 

Maybe<PrefType> is a better way of representing "no type".

MozReview-Commit-ID: Fnha5RxbNg4

--HG--
extra : rebase_source : 8e8322b0443305ab71acd6d98ea2607f626c5bce
This commit is contained in:
Nicholas Nethercote 2017-11-19 14:42:20 +11:00
Родитель 7e91e21a8a
Коммит 6207a59f90
1 изменённых файлов: 45 добавлений и 53 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

98
modules/libpref/Preferences.cpp
Просмотреть файл

@ -19,6 +19,7 @@
#include "mozilla/dom/PContent.h"
#include "mozilla/HashFunctions.h"
#include "mozilla/Logging.h"
#include "mozilla/Maybe.h"
#include "mozilla/MemoryReporting.h"
#include "mozilla/ModuleUtils.h"
#include "mozilla/Omnijar.h"
@ -124,9 +125,8 @@ static const uint32_t MAX_PREF_LENGTH = 1 * 1024 * 1024;
// Actually, 4kb should be enough for everyone.
static const uint32_t MAX_ADVISABLE_PREF_LENGTH = 4 * 1024;
enum class PrefType
enum class PrefType : uint8_t
{
Invalid = 0,
String = 1,
Int = 2,
Bool = 3,
@ -156,7 +156,6 @@ union PrefValue {
case PrefType::Bool:
return mBoolVal == aValue.mBoolVal;
case PrefType::Invalid:
default:
MOZ_CRASH("Unhandled enum value");
}
@ -168,8 +167,6 @@ const char*
PrefTypeToString(PrefType aType)
{
switch (aType) {
case PrefType::Invalid:
return "INVALID";
case PrefType::String:
return "string";
case PrefType::Int:
@ -1056,7 +1053,7 @@ PREF_ReaderCallback(void* aClosure,
// |aClosure| is user data passed to PREF_InitParseState.
// |aPref| is the preference name.
// |aValue| is the preference value.
// |aType| is the preference type (PREF_STRING, PREF_INT, or PREF_BOOL).
// |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,
@ -1076,22 +1073,22 @@ struct PrefParseState
PrefReader mReader;
PrefParseErrorReporter mReporter;
void* mClosure;
int mState; // PREF_PARSE_...
int 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)
PrefType mVtype; // PREF_{STRING,INT,BOOL}
bool mIsDefault; // true if (default) pref
bool mIsSticky; // true if (sticky) pref
int mState; // PREF_PARSE_...
int 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
};
// Pref parser states.
@ -1265,7 +1262,7 @@ PREF_ParseBuf(PrefParseState* aPS, const char* aBuf, int aBufLen)
if (aPS->mLbCur != aPS->mLb) { // reset state
aPS->mLbCur = aPS->mLb;
aPS->mVb = nullptr;
aPS->mVtype = PrefType::Invalid;
aPS->mVtype = Nothing();
aPS->mIsDefault = false;
aPS->mIsSticky = false;
}
@ -1368,19 +1365,19 @@ PREF_ParseBuf(PrefParseState* aPS, const char* aBuf, int aBufLen)
// The pref value type is unknown. So, we scan for the first character
// of the value, and determine the type from that.
if (c == '\"' || c == '\'') {
aPS->mVtype = PrefType::String;
aPS->mVtype = Some(PrefType::String);
aPS->mQuoteChar = c;
aPS->mNextState = PREF_PARSE_UNTIL_CLOSE_PAREN;
state = PREF_PARSE_QUOTED_STRING;
} else if (c == 't' || c == 'f') {
aPS->mVb = (char*)(c == 't' ? kTrue : kFalse);
aPS->mVtype = PrefType::Bool;
aPS->mVtype = Some(PrefType::Bool);
aPS->mStrMatch = aPS->mVb;
aPS->mStrIndex = 1;
aPS->mNextState = PREF_PARSE_UNTIL_CLOSE_PAREN;
state = PREF_PARSE_MATCH_STRING;
} else if (isdigit(c) || (c == '-') || (c == '+')) {
aPS->mVtype = PrefType::Int;
aPS->mVtype = Some(PrefType::Int);
// write c to line buffer...
if (aPS->mLbCur == aPS->mLbEnd && !pref_GrowBuf(aPS)) {
return false; // out of memory
@ -1632,7 +1629,7 @@ PREF_ParseBuf(PrefParseState* aPS, const char* aBuf, int aBufLen)
PrefValue value;
switch (aPS->mVtype) {
switch (*aPS->mVtype) {
case PrefType::String:
value.mStringVal = aPS->mVb;
break;
@ -1652,14 +1649,14 @@ PREF_ParseBuf(PrefParseState* aPS, const char* aBuf, int aBufLen)
break;
default:
break;
MOZ_CRASH();
}
// We've extracted a complete name/value pair.
aPS->mReader(aPS->mClosure,
aPS->mLb,
value,
aPS->mVtype,
*aPS->mVtype,
aPS->mIsDefault,
aPS->mIsSticky);
@ -2026,31 +2023,26 @@ nsPrefBranch::GetPrefType(const char* aPrefName, int32_t* aRetVal)
NS_ENSURE_ARG(aPrefName);
const PrefName& prefName = GetPrefName(aPrefName);
PrefType type = PrefType::Invalid;
if (gHashTable) {
PrefHashEntry* pref = pref_HashTableLookup(prefName.get());
if (pref) {
type = pref->Type();
PrefHashEntry* pref;
if (gHashTable && (pref = pref_HashTableLookup(prefName.get()))) {
switch (pref->Type()) {
case PrefType::String:
*aRetVal = PREF_STRING;
break;
case PrefType::Int:
*aRetVal = PREF_INT;
break;
case PrefType::Bool:
*aRetVal = PREF_BOOL;
break;
default:
MOZ_CRASH();
}
}
switch (type) {
case PrefType::String:
*aRetVal = PREF_STRING;
break;
case PrefType::Int:
*aRetVal = PREF_INT;
break;
case PrefType::Bool:
*aRetVal = PREF_BOOL;
break;
case PrefType::Invalid:
default:
*aRetVal = PREF_INVALID;
break;
} else {
*aRetVal = PREF_INVALID;
}
return NS_OK;
}