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

Bug 1418847 - Move some constants into class Parser. r=glandium

Browse Source 
MozReview-Commit-ID: 1eZiyrUWjFp
This commit is contained in:
Nicholas Nethercote
2017-11-19 20:10:39 +11:00
parent 880dcb7f03
commit 8c48a6806d
1 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
modules/libpref/Preferences.cpp
View File

@@ -1132,6 +1132,16 @@ private:
eUntilEOL
};
static const int kUTF16EscapeNumDigits = 4;
static const int kHexEscapeNumDigits = 2;
static const int KBitsPerHexDigit = 4;
static constexpr const char* kUserPref = "user_pref";
static constexpr const char* kPref = "pref";
static constexpr const char* kStickyPref = "sticky_pref";
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
@@ -1153,16 +1163,6 @@ private:
bool mIsSticky; // true if (sticky) pref
};
#define UTF16_ESC_NUM_DIGITS 4
#define HEX_ESC_NUM_DIGITS 2
#define BITS_PER_HEX_DIGIT 4
static const char kUserPref[] = "user_pref";
static const char kPref[] = "pref";
static const char kStickyPref[] = "sticky_pref";
static const char kTrue[] = "true";
static const char kFalse[] = "false";
// This function will increase the size of the buffer owned by the given pref
// parse state. We currently use a simple doubling algorithm, but the only hard
// requirement is that it increase the buffer by at least the size of the
@@ -1477,7 +1477,8 @@ Parser::Parse(const char* aBuf, int aBufLen)
mEscTmp[0] = c;
mEscLen = 1;
mUtf16[0] = mUtf16[1] = 0;
mStrIndex = (c == 'x') ? HEX_ESC_NUM_DIGITS : UTF16_ESC_NUM_DIGITS;
mStrIndex =
(c == 'x') ? kHexEscapeNumDigits : kUTF16EscapeNumDigits;
state = State::eHexEscape;
continue;
default:
@@ -1526,7 +1527,7 @@ Parser::Parse(const char* aBuf, int aBufLen)
// have a digit
mEscTmp[mEscLen++] = c; // preserve it
mUtf16[1] <<= BITS_PER_HEX_DIGIT;
mUtf16[1] <<= KBitsPerHexDigit;
mUtf16[1] |= udigit;
mStrIndex--;
if (mStrIndex == 0) {
@@ -1567,7 +1568,7 @@ Parser::Parse(const char* aBuf, int aBufLen)
++mStrIndex;
} else if (mStrIndex == 1 && c == 'u') {
// escape sequence is correct, now parse hex
mStrIndex = UTF16_ESC_NUM_DIGITS;
mStrIndex = kUTF16EscapeNumDigits;
mEscTmp[0] = 'u';
mEscLen = 1;
state = State::eHexEscape;