--- a/modules/libpref/prefread.cpp
+++ b/modules/libpref/prefread.cpp
@@ -1,28 +1,31 @@
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim: set ts=8 sts=2 et sw=2 tw=80: */
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+#include <ctype.h>
#include <stdlib.h>
#include <string.h>
-#include <ctype.h>
-#include "prefread.h"
+
#include "nsString.h"
#include "nsUTF8Utils.h"
+#include "prefread.h"
#ifdef TEST_PREFREAD
#include <stdio.h>
#define NS_WARNING(_s) printf(">>> " _s "!\n")
#define NS_NOTREACHED(_s) NS_WARNING(_s)
#else
#include "nsDebug.h" // for NS_WARNING
#endif
-/* pref parser states */
+// Pref parser states.
enum
{
PREF_PARSE_INIT,
PREF_PARSE_MATCH_STRING,
PREF_PARSE_UNTIL_NAME,
PREF_PARSE_QUOTED_STRING,
PREF_PARSE_UNTIL_COMMA,
PREF_PARSE_UNTIL_VALUE,
@@ -44,607 +47,622 @@ enum
#define BITS_PER_HEX_DIGIT 4
static const char kUserPref[] = "user_pref";
static const char kPref[] = "pref";
static const char kPrefSticky[] = "sticky_pref";
static const char kTrue[] = "true";
static const char kFalse[] = "false";
-/**
- * pref_GrowBuf
- *
- * 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 ps->esctmp
- * buffer used for escape processing (currently 6 bytes).
- *
- * this buffer is used to store partial pref lines. it is
- * freed when the parse state is destroyed.
- *
- * @param ps
- * parse state instance
- *
- * this function updates all pointers that reference an
- * address within lb since realloc may relocate the buffer.
- *
- * @return false if insufficient memory.
- */
+// 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
+// aPS->esctmp buffer used for escape processing (currently 6 bytes).
+//
+// The buffer is used to store partial pref lines. It is freed when the parse
+// state is destroyed.
+//
+// @param aPS
+// parse state instance
+//
+// This function updates all pointers that reference an address within lb since
+// realloc may relocate the buffer.
+//
+// @return false if insufficient memory.
static bool
-pref_GrowBuf(PrefParseState* ps)
+pref_GrowBuf(PrefParseState* aPS)
{
int bufLen, curPos, valPos;
- bufLen = ps->lbend - ps->lb;
- curPos = ps->lbcur - ps->lb;
- valPos = ps->vb - ps->lb;
+ bufLen = aPS->lbend - aPS->lb;
+ curPos = aPS->lbcur - aPS->lb;
+ valPos = aPS->vb - aPS->lb;
- if (bufLen == 0)
- bufLen = 128; /* default buffer size */
- else
- bufLen <<= 1; /* double buffer size */
+ if (bufLen == 0) {
+ bufLen = 128; // default buffer size
+ } else {
+ bufLen <<= 1; // double buffer size
+ }
#ifdef TEST_PREFREAD
fprintf(stderr, ">>> realloc(%d)\n", bufLen);
#endif
- ps->lb = (char*)realloc(ps->lb, bufLen);
- if (!ps->lb)
+ aPS->lb = (char*)realloc(aPS->lb, bufLen);
+ if (!aPS->lb) {
return false;
+ }
- ps->lbcur = ps->lb + curPos;
- ps->lbend = ps->lb + bufLen;
- ps->vb = ps->lb + valPos;
+ aPS->lbcur = aPS->lb + curPos;
+ aPS->lbend = aPS->lb + bufLen;
+ aPS->vb = aPS->lb + valPos;
return true;
}
-/**
- * Report an error or a warning. If not specified, just dump to stderr.
- */
+// Report an error or a warning. If not specified, just dump to stderr.
static void
-pref_ReportParseProblem(PrefParseState& ps,
+pref_ReportParseProblem(PrefParseState& aPS,
const char* aMessage,
int aLine,
bool aError)
{
- if (ps.reporter) {
- ps.reporter(aMessage, aLine, aError);
+ if (aPS.reporter) {
+ aPS.reporter(aMessage, aLine, aError);
} else {
printf_stderr("**** Preference parsing %s (line %d) = %s **\n",
(aError ? "error" : "warning"),
aLine,
aMessage);
}
}
-/**
- * pref_DoCallback
- *
- * this function is called when a complete pref name-value pair has
- * been extracted from the input data.
- *
- * @param ps
- * parse state instance
- *
- * @return false to indicate a fatal error.
- */
+// This function is called when a complete pref name-value pair has been
+// extracted from the input data.
+//
+// @param aPS
+// parse state instance
+//
+// @return false to indicate a fatal error.
static bool
-pref_DoCallback(PrefParseState* ps)
+pref_DoCallback(PrefParseState* aPS)
{
PrefValue value;
- switch (ps->vtype) {
+ switch (aPS->vtype) {
case PrefType::String:
- value.stringVal = ps->vb;
+ value.stringVal = aPS->vb;
break;
+
case PrefType::Int:
- if ((ps->vb[0] == '-' || ps->vb[0] == '+') && ps->vb[1] == '\0') {
- pref_ReportParseProblem(*ps, "invalid integer value", 0, true);
+ if ((aPS->vb[0] == '-' || aPS->vb[0] == '+') && aPS->vb[1] == '\0') {
+ pref_ReportParseProblem(*aPS, "invalid integer value", 0, true);
NS_WARNING("malformed integer value");
return false;
}
- value.intVal = atoi(ps->vb);
+ value.intVal = atoi(aPS->vb);
break;
+
case PrefType::Bool:
- value.boolVal = (ps->vb == kTrue);
+ value.boolVal = (aPS->vb == kTrue);
break;
+
default:
break;
}
- (*ps->reader)(
- ps->closure, ps->lb, value, ps->vtype, ps->fdefault, ps->fstickydefault);
+
+ (*aPS->reader)(aPS->closure,
+ aPS->lb,
+ value,
+ aPS->vtype,
+ aPS->fdefault,
+ aPS->fstickydefault);
return true;
}
void
-PREF_InitParseState(PrefParseState* ps,
- PrefReader reader,
- PrefParseErrorReporter reporter,
- void* closure)
+PREF_InitParseState(PrefParseState* aPS,
+ PrefReader aReader,
+ PrefParseErrorReporter aReporter,
+ void* aClosure)
{
- memset(ps, 0, sizeof(*ps));
- ps->reader = reader;
- ps->closure = closure;
- ps->reporter = reporter;
+ memset(aPS, 0, sizeof(*aPS));
+ aPS->reader = aReader;
+ aPS->closure = aClosure;
+ aPS->reporter = aReporter;
}
void
-PREF_FinalizeParseState(PrefParseState* ps)
+PREF_FinalizeParseState(PrefParseState* aPS)
{
- if (ps->lb)
- free(ps->lb);
+ if (aPS->lb) {
+ free(aPS->lb);
+ }
}
-/**
- * Pseudo-BNF
- * ----------
- * function = LJUNK function-name JUNK function-args
- * function-name = "user_pref" | "pref" | "sticky_pref"
- * function-args = "(" JUNK pref-name JUNK "," JUNK pref-value JUNK ")" JUNK ";"
- * pref-name = quoted-string
- * pref-value = quoted-string | "true" | "false" | integer-value
- * JUNK = *(WS | comment-block | comment-line)
- * LJUNK = *(WS | comment-block | comment-line | bcomment-line)
- * WS = SP | HT | LF | VT | FF | CR
- * SP = <US-ASCII SP, space (32)>
- * HT = <US-ASCII HT, horizontal-tab (9)>
- * LF = <US-ASCII LF, linefeed (10)>
- * VT = <US-ASCII HT, vertical-tab (11)>
- * FF = <US-ASCII FF, form-feed (12)>
- * CR = <US-ASCII CR, carriage return (13)>
- * comment-block = <C/C++ style comment block>
- * comment-line = <C++ style comment line>
- * bcomment-line = <bourne-shell style comment line>
- */
+// Pseudo-BNF
+// ----------
+// function = LJUNK function-name JUNK function-args
+// function-name = "user_pref" | "pref" | "sticky_pref"
+// function-args = "(" JUNK pref-name JUNK "," JUNK pref-value JUNK ")" JUNK ";"
+// pref-name = quoted-string
+// pref-value = quoted-string | "true" | "false" | integer-value
+// JUNK = *(WS | comment-block | comment-line)
+// LJUNK = *(WS | comment-block | comment-line | bcomment-line)
+// WS = SP | HT | LF | VT | FF | CR
+// SP = <US-ASCII SP, space (32)>
+// HT = <US-ASCII HT, horizontal-tab (9)>
+// LF = <US-ASCII LF, linefeed (10)>
+// VT = <US-ASCII HT, vertical-tab (11)>
+// FF = <US-ASCII FF, form-feed (12)>
+// CR = <US-ASCII CR, carriage return (13)>
+// comment-block = <C/C++ style comment block>
+// comment-line = <C++ style comment line>
+// bcomment-line = <bourne-shell style comment line>
+//
bool
-PREF_ParseBuf(PrefParseState* ps, const char* buf, int bufLen)
+PREF_ParseBuf(PrefParseState* aPS, const char* aBuf, int aBufLen)
{
const char* end;
char c;
char udigit;
int state;
// The line number is currently only used for the error/warning reporting.
int lineNum = 0;
- state = ps->state;
- for (end = buf + bufLen; buf != end; ++buf) {
- c = *buf;
+ state = aPS->state;
+ for (end = aBuf + aBufLen; aBuf != end; ++aBuf) {
+ c = *aBuf;
if (c == '\r' || c == '\n' || c == 0x1A) {
lineNum++;
}
switch (state) {
- /* initial state */
+ // initial state
case PREF_PARSE_INIT:
- if (ps->lbcur != ps->lb) { /* reset state */
- ps->lbcur = ps->lb;
- ps->vb = nullptr;
- ps->vtype = PrefType::Invalid;
- ps->fdefault = false;
- ps->fstickydefault = false;
+ if (aPS->lbcur != aPS->lb) { // reset state
+ aPS->lbcur = aPS->lb;
+ aPS->vb = nullptr;
+ aPS->vtype = PrefType::Invalid;
+ aPS->fdefault = false;
+ aPS->fstickydefault = false;
}
switch (c) {
- case '/': /* begin comment block or line? */
+ case '/': // begin comment block or line?
state = PREF_PARSE_COMMENT_MAYBE_START;
break;
- case '#': /* accept shell style comments */
+ case '#': // accept shell style comments
state = PREF_PARSE_UNTIL_EOL;
break;
- case 'u': /* indicating user_pref */
- case 's': /* indicating sticky_pref */
- case 'p': /* indicating pref */
+ case 'u': // indicating user_pref
+ case 's': // indicating sticky_pref
+ case 'p': // indicating pref
if (c == 'u') {
- ps->smatch = kUserPref;
+ aPS->smatch = kUserPref;
} else if (c == 's') {
- ps->smatch = kPrefSticky;
+ aPS->smatch = kPrefSticky;
} else {
- ps->smatch = kPref;
+ aPS->smatch = kPref;
}
- ps->sindex = 1;
- ps->nextstate = PREF_PARSE_UNTIL_OPEN_PAREN;
+ aPS->sindex = 1;
+ aPS->nextstate = PREF_PARSE_UNTIL_OPEN_PAREN;
state = PREF_PARSE_MATCH_STRING;
break;
- /* else skip char */
+ // else skip char
}
break;
- /* string matching */
+ // string matching
case PREF_PARSE_MATCH_STRING:
- if (c == ps->smatch[ps->sindex++]) {
- /* if we've matched all characters, then move to next state. */
- if (ps->smatch[ps->sindex] == '\0') {
- state = ps->nextstate;
- ps->nextstate = PREF_PARSE_INIT; /* reset next state */
+ if (c == aPS->smatch[aPS->sindex++]) {
+ // If we've matched all characters, then move to next state.
+ if (aPS->smatch[aPS->sindex] == '\0') {
+ state = aPS->nextstate;
+ aPS->nextstate = PREF_PARSE_INIT; // reset next state
}
- /* else wait for next char */
+ // else wait for next char
} else {
- pref_ReportParseProblem(*ps, "non-matching string", lineNum, true);
+ pref_ReportParseProblem(*aPS, "non-matching string", lineNum, true);
NS_WARNING("malformed pref file");
return false;
}
break;
- /* quoted string parsing */
+ // quoted string parsing
case PREF_PARSE_QUOTED_STRING:
- /* we assume that the initial quote has already been consumed */
- if (ps->lbcur == ps->lbend && !pref_GrowBuf(ps))
- return false; /* out of memory */
- if (c == '\\')
+ // we assume that the initial quote has already been consumed
+ if (aPS->lbcur == aPS->lbend && !pref_GrowBuf(aPS)) {
+ return false; // out of memory
+ }
+ if (c == '\\') {
state = PREF_PARSE_ESC_SEQUENCE;
- else if (c == ps->quotechar) {
- *ps->lbcur++ = '\0';
- state = ps->nextstate;
- ps->nextstate = PREF_PARSE_INIT; /* reset next state */
- } else
- *ps->lbcur++ = c;
+ } else if (c == aPS->quotechar) {
+ *aPS->lbcur++ = '\0';
+ state = aPS->nextstate;
+ aPS->nextstate = PREF_PARSE_INIT; // reset next state
+ } else {
+ *aPS->lbcur++ = c;
+ }
break;
- /* name parsing */
+ // name parsing
case PREF_PARSE_UNTIL_NAME:
if (c == '\"' || c == '\'') {
- ps->fdefault = (ps->smatch == kPref || ps->smatch == kPrefSticky);
- ps->fstickydefault = (ps->smatch == kPrefSticky);
- ps->quotechar = c;
- ps->nextstate = PREF_PARSE_UNTIL_COMMA; /* return here when done */
+ aPS->fdefault = (aPS->smatch == kPref || aPS->smatch == kPrefSticky);
+ aPS->fstickydefault = (aPS->smatch == kPrefSticky);
+ aPS->quotechar = c;
+ aPS->nextstate = PREF_PARSE_UNTIL_COMMA; // return here when done
state = PREF_PARSE_QUOTED_STRING;
- } else if (c == '/') { /* allow embedded comment */
- ps->nextstate = state; /* return here when done with comment */
+ } else if (c == '/') { // allow embedded comment
+ aPS->nextstate = state; // return here when done with comment
state = PREF_PARSE_COMMENT_MAYBE_START;
} else if (!isspace(c)) {
pref_ReportParseProblem(
- *ps, "need space, comment or quote", lineNum, true);
+ *aPS, "need space, comment or quote", lineNum, true);
NS_WARNING("malformed pref file");
return false;
}
break;
- /* parse until we find a comma separating name and value */
+ // parse until we find a comma separating name and value
case PREF_PARSE_UNTIL_COMMA:
if (c == ',') {
- ps->vb = ps->lbcur;
+ aPS->vb = aPS->lbcur;
state = PREF_PARSE_UNTIL_VALUE;
- } else if (c == '/') { /* allow embedded comment */
- ps->nextstate = state; /* return here when done with comment */
+ } else if (c == '/') { // allow embedded comment
+ aPS->nextstate = state; // return here when done with comment
state = PREF_PARSE_COMMENT_MAYBE_START;
} else if (!isspace(c)) {
pref_ReportParseProblem(
- *ps, "need space, comment or comma", lineNum, true);
+ *aPS, "need space, comment or comma", lineNum, true);
NS_WARNING("malformed pref file");
return false;
}
break;
- /* value parsing */
+ // value parsing
case PREF_PARSE_UNTIL_VALUE:
- /* the pref value type is unknown. so, we scan for the first
- * character of the value, and determine the type from that. */
+ // 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 == '\'') {
- ps->vtype = PrefType::String;
- ps->quotechar = c;
- ps->nextstate = PREF_PARSE_UNTIL_CLOSE_PAREN;
+ aPS->vtype = PrefType::String;
+ aPS->quotechar = c;
+ aPS->nextstate = PREF_PARSE_UNTIL_CLOSE_PAREN;
state = PREF_PARSE_QUOTED_STRING;
} else if (c == 't' || c == 'f') {
- ps->vb = (char*)(c == 't' ? kTrue : kFalse);
- ps->vtype = PrefType::Bool;
- ps->smatch = ps->vb;
- ps->sindex = 1;
- ps->nextstate = PREF_PARSE_UNTIL_CLOSE_PAREN;
+ aPS->vb = (char*)(c == 't' ? kTrue : kFalse);
+ aPS->vtype = PrefType::Bool;
+ aPS->smatch = aPS->vb;
+ aPS->sindex = 1;
+ aPS->nextstate = PREF_PARSE_UNTIL_CLOSE_PAREN;
state = PREF_PARSE_MATCH_STRING;
} else if (isdigit(c) || (c == '-') || (c == '+')) {
- ps->vtype = PrefType::Int;
- /* write c to line buffer... */
- if (ps->lbcur == ps->lbend && !pref_GrowBuf(ps))
- return false; /* out of memory */
- *ps->lbcur++ = c;
+ aPS->vtype = PrefType::Int;
+ // write c to line buffer...
+ if (aPS->lbcur == aPS->lbend && !pref_GrowBuf(aPS)) {
+ return false; // out of memory
+ }
+ *aPS->lbcur++ = c;
state = PREF_PARSE_INT_VALUE;
- } else if (c == '/') { /* allow embedded comment */
- ps->nextstate = state; /* return here when done with comment */
+ } else if (c == '/') { // allow embedded comment
+ aPS->nextstate = state; // return here when done with comment
state = PREF_PARSE_COMMENT_MAYBE_START;
} else if (!isspace(c)) {
pref_ReportParseProblem(
- *ps, "need value, comment or space", lineNum, true);
+ *aPS, "need value, comment or space", lineNum, true);
NS_WARNING("malformed pref file");
return false;
}
break;
+
case PREF_PARSE_INT_VALUE:
- /* grow line buffer if necessary... */
- if (ps->lbcur == ps->lbend && !pref_GrowBuf(ps))
- return false; /* out of memory */
- if (isdigit(c))
- *ps->lbcur++ = c;
- else {
- *ps->lbcur++ = '\0'; /* stomp null terminator; we are done. */
- if (c == ')')
+ // grow line buffer if necessary...
+ if (aPS->lbcur == aPS->lbend && !pref_GrowBuf(aPS)) {
+ return false; // out of memory
+ }
+ if (isdigit(c)) {
+ *aPS->lbcur++ = c;
+ } else {
+ *aPS->lbcur++ = '\0'; // stomp null terminator; we are done.
+ if (c == ')') {
state = PREF_PARSE_UNTIL_SEMICOLON;
- else if (c == '/') { /* allow embedded comment */
- ps->nextstate = PREF_PARSE_UNTIL_CLOSE_PAREN;
+ } else if (c == '/') { // allow embedded comment
+ aPS->nextstate = PREF_PARSE_UNTIL_CLOSE_PAREN;
state = PREF_PARSE_COMMENT_MAYBE_START;
- } else if (isspace(c))
+ } else if (isspace(c)) {
state = PREF_PARSE_UNTIL_CLOSE_PAREN;
- else {
+ } else {
pref_ReportParseProblem(
- *ps, "while parsing integer", lineNum, true);
+ *aPS, "while parsing integer", lineNum, true);
NS_WARNING("malformed pref file");
return false;
}
}
break;
- /* comment parsing */
+ // comment parsing
case PREF_PARSE_COMMENT_MAYBE_START:
switch (c) {
- case '*': /* comment block */
+ case '*': // comment block
state = PREF_PARSE_COMMENT_BLOCK;
break;
- case '/': /* comment line */
+ case '/': // comment line
state = PREF_PARSE_UNTIL_EOL;
break;
default:
- /* pref file is malformed */
+ // pref file is malformed
pref_ReportParseProblem(
- *ps, "while parsing comment", lineNum, true);
+ *aPS, "while parsing comment", lineNum, true);
NS_WARNING("malformed pref file");
return false;
}
break;
+
case PREF_PARSE_COMMENT_BLOCK:
- if (c == '*')
+ if (c == '*') {
state = PREF_PARSE_COMMENT_BLOCK_MAYBE_END;
+ }
break;
+
case PREF_PARSE_COMMENT_BLOCK_MAYBE_END:
switch (c) {
case '/':
- state = ps->nextstate;
- ps->nextstate = PREF_PARSE_INIT;
+ state = aPS->nextstate;
+ aPS->nextstate = PREF_PARSE_INIT;
break;
- case '*': /* stay in this state */
+ case '*': // stay in this state
break;
default:
state = PREF_PARSE_COMMENT_BLOCK;
+ break;
}
break;
- /* string escape sequence parsing */
+ // string escape sequence parsing
case PREF_PARSE_ESC_SEQUENCE:
- /* not necessary to resize buffer here since we should be writing
- * only one character and the resize check would have been done
- * for us in the previous state */
+ // It's not necessary to resize the buffer here since we should be
+ // writing only one character and the resize check would have been done
+ // for us in the previous state.
switch (c) {
case '\"':
case '\'':
case '\\':
break;
case 'r':
c = '\r';
break;
case 'n':
c = '\n';
break;
- case 'x': /* hex escape -- always interpreted as Latin-1 */
- case 'u': /* UTF16 escape */
- ps->esctmp[0] = c;
- ps->esclen = 1;
- ps->utf16[0] = ps->utf16[1] = 0;
- ps->sindex = (c == 'x') ? HEX_ESC_NUM_DIGITS : UTF16_ESC_NUM_DIGITS;
+ case 'x': // hex escape -- always interpreted as Latin-1
+ case 'u': // UTF16 escape
+ aPS->esctmp[0] = c;
+ aPS->esclen = 1;
+ aPS->utf16[0] = aPS->utf16[1] = 0;
+ aPS->sindex = (c == 'x') ? HEX_ESC_NUM_DIGITS : UTF16_ESC_NUM_DIGITS;
state = PREF_PARSE_HEX_ESCAPE;
continue;
default:
pref_ReportParseProblem(
- *ps, "preserving unexpected JS escape sequence", lineNum, false);
+ *aPS, "preserving unexpected JS escape sequence", lineNum, false);
NS_WARNING("preserving unexpected JS escape sequence");
- /* Invalid escape sequence so we do have to write more than
- * one character. Grow line buffer if necessary... */
- if ((ps->lbcur + 1) == ps->lbend && !pref_GrowBuf(ps))
- return false; /* out of memory */
- *ps->lbcur++ = '\\'; /* preserve the escape sequence */
+ // Invalid escape sequence so we do have to write more than one
+ // character. Grow line buffer if necessary...
+ if ((aPS->lbcur + 1) == aPS->lbend && !pref_GrowBuf(aPS)) {
+ return false; // out of memory
+ }
+ *aPS->lbcur++ = '\\'; // preserve the escape sequence
break;
}
- *ps->lbcur++ = c;
+ *aPS->lbcur++ = c;
state = PREF_PARSE_QUOTED_STRING;
break;
- /* parsing a hex (\xHH) or utf16 escape (\uHHHH) */
+ // parsing a hex (\xHH) or utf16 escape (\uHHHH)
case PREF_PARSE_HEX_ESCAPE:
- if (c >= '0' && c <= '9')
+ if (c >= '0' && c <= '9') {
udigit = (c - '0');
- else if (c >= 'A' && c <= 'F')
+ } else if (c >= 'A' && c <= 'F') {
udigit = (c - 'A') + 10;
- else if (c >= 'a' && c <= 'f')
+ } else if (c >= 'a' && c <= 'f') {
udigit = (c - 'a') + 10;
- else {
- /* bad escape sequence found, write out broken escape as-is */
+ } else {
+ // bad escape sequence found, write out broken escape as-is
pref_ReportParseProblem(
- *ps, "preserving invalid or incomplete hex escape", lineNum, false);
+ *aPS, "preserving invalid or incomplete hex escape", lineNum, false);
NS_WARNING("preserving invalid or incomplete hex escape");
- *ps->lbcur++ = '\\'; /* original escape slash */
- if ((ps->lbcur + ps->esclen) >= ps->lbend && !pref_GrowBuf(ps))
+ *aPS->lbcur++ = '\\'; // original escape slash
+ if ((aPS->lbcur + aPS->esclen) >= aPS->lbend && !pref_GrowBuf(aPS)) {
return false;
- for (int i = 0; i < ps->esclen; ++i)
- *ps->lbcur++ = ps->esctmp[i];
+ }
+ for (int i = 0; i < aPS->esclen; ++i) {
+ *aPS->lbcur++ = aPS->esctmp[i];
+ }
- /* push the non-hex character back for re-parsing. */
- /* (++buf at the top of the loop keeps this safe) */
- --buf;
+ // Push the non-hex character back for re-parsing. (++aBuf at the top
+ // of the loop keeps this safe.)
+ --aBuf;
state = PREF_PARSE_QUOTED_STRING;
continue;
}
- /* have a digit */
- ps->esctmp[ps->esclen++] = c; /* preserve it */
- ps->utf16[1] <<= BITS_PER_HEX_DIGIT;
- ps->utf16[1] |= udigit;
- ps->sindex--;
- if (ps->sindex == 0) {
- /* have the full escape. Convert to UTF8 */
+ // have a digit
+ aPS->esctmp[aPS->esclen++] = c; // preserve it
+ aPS->utf16[1] <<= BITS_PER_HEX_DIGIT;
+ aPS->utf16[1] |= udigit;
+ aPS->sindex--;
+ if (aPS->sindex == 0) {
+ // we have the full escape, convert to UTF8
int utf16len = 0;
- if (ps->utf16[0]) {
- /* already have a high surrogate, this is a two char seq */
+ if (aPS->utf16[0]) {
+ // already have a high surrogate, this is a two char seq
utf16len = 2;
- } else if (0xD800 == (0xFC00 & ps->utf16[1])) {
- /* a high surrogate, can't convert until we have the low */
- ps->utf16[0] = ps->utf16[1];
- ps->utf16[1] = 0;
+ } else if (0xD800 == (0xFC00 & aPS->utf16[1])) {
+ // a high surrogate, can't convert until we have the low
+ aPS->utf16[0] = aPS->utf16[1];
+ aPS->utf16[1] = 0;
state = PREF_PARSE_UTF16_LOW_SURROGATE;
break;
} else {
- /* a single utf16 character */
- ps->utf16[0] = ps->utf16[1];
+ // a single utf16 character
+ aPS->utf16[0] = aPS->utf16[1];
utf16len = 1;
}
- /* actual conversion */
- /* make sure there's room, 6 bytes is max utf8 len (in */
- /* theory; 4 bytes covers the actual utf16 range) */
- if (ps->lbcur + 6 >= ps->lbend && !pref_GrowBuf(ps))
+ // The actual conversion.
+ // Make sure there's room, 6 bytes is max utf8 len (in theory; 4
+ // bytes covers the actual utf16 range).
+ if (aPS->lbcur + 6 >= aPS->lbend && !pref_GrowBuf(aPS)) {
return false;
+ }
- ConvertUTF16toUTF8 converter(ps->lbcur);
- converter.write(ps->utf16, utf16len);
- ps->lbcur += converter.Size();
+ ConvertUTF16toUTF8 converter(aPS->lbcur);
+ converter.write(aPS->utf16, utf16len);
+ aPS->lbcur += converter.Size();
state = PREF_PARSE_QUOTED_STRING;
}
break;
- /* looking for beginning of utf16 low surrogate */
+ // looking for beginning of utf16 low surrogate
case PREF_PARSE_UTF16_LOW_SURROGATE:
- if (ps->sindex == 0 && c == '\\') {
- ++ps->sindex;
- } else if (ps->sindex == 1 && c == 'u') {
- /* escape sequence is correct, now parse hex */
- ps->sindex = UTF16_ESC_NUM_DIGITS;
- ps->esctmp[0] = 'u';
- ps->esclen = 1;
+ if (aPS->sindex == 0 && c == '\\') {
+ ++aPS->sindex;
+ } else if (aPS->sindex == 1 && c == 'u') {
+ // escape sequence is correct, now parse hex
+ aPS->sindex = UTF16_ESC_NUM_DIGITS;
+ aPS->esctmp[0] = 'u';
+ aPS->esclen = 1;
state = PREF_PARSE_HEX_ESCAPE;
} else {
- /* didn't find expected low surrogate. Ignore high surrogate
- * (it would just get converted to nothing anyway) and start
- * over with this character */
- --buf;
- if (ps->sindex == 1)
+ // Didn't find expected low surrogate. Ignore high surrogate (it
+ // would just get converted to nothing anyway) and start over with
+ // this character.
+ --aBuf;
+ if (aPS->sindex == 1) {
state = PREF_PARSE_ESC_SEQUENCE;
- else
+ } else {
state = PREF_PARSE_QUOTED_STRING;
+ }
continue;
}
break;
- /* function open and close parsing */
+ // function open and close parsing
case PREF_PARSE_UNTIL_OPEN_PAREN:
- /* tolerate only whitespace and embedded comments */
- if (c == '(')
+ // tolerate only whitespace and embedded comments
+ if (c == '(') {
state = PREF_PARSE_UNTIL_NAME;
- else if (c == '/') {
- ps->nextstate = state; /* return here when done with comment */
+ } else if (c == '/') {
+ aPS->nextstate = state; // return here when done with comment
state = PREF_PARSE_COMMENT_MAYBE_START;
} else if (!isspace(c)) {
pref_ReportParseProblem(
- *ps, "need space, comment or open parentheses", lineNum, true);
- NS_WARNING("malformed pref file");
- return false;
- }
- break;
- case PREF_PARSE_UNTIL_CLOSE_PAREN:
- /* tolerate only whitespace and embedded comments */
- if (c == ')') {
- state = PREF_PARSE_UNTIL_SEMICOLON;
- } else if (c == '/') {
- ps->nextstate = state; /* return here when done with comment */
- state = PREF_PARSE_COMMENT_MAYBE_START;
- } else if (!isspace(c)) {
- pref_ReportParseProblem(
- *ps, "need space, comment or closing parentheses", lineNum, true);
+ *aPS, "need space, comment or open parentheses", lineNum, true);
NS_WARNING("malformed pref file");
return false;
}
break;
- /* function terminator ';' parsing */
- case PREF_PARSE_UNTIL_SEMICOLON:
- /* tolerate only whitespace and embedded comments */
- if (c == ';') {
- if (!pref_DoCallback(ps))
- return false;
- state = PREF_PARSE_INIT;
+ case PREF_PARSE_UNTIL_CLOSE_PAREN:
+ // tolerate only whitespace and embedded comments
+ if (c == ')') {
+ state = PREF_PARSE_UNTIL_SEMICOLON;
} else if (c == '/') {
- ps->nextstate = state; /* return here when done with comment */
+ aPS->nextstate = state; // return here when done with comment
state = PREF_PARSE_COMMENT_MAYBE_START;
} else if (!isspace(c)) {
pref_ReportParseProblem(
- *ps, "need space, comment or semicolon", lineNum, true);
+ *aPS, "need space, comment or closing parentheses", lineNum, true);
NS_WARNING("malformed pref file");
return false;
}
break;
- /* eol parsing */
+ // function terminator ';' parsing
+ case PREF_PARSE_UNTIL_SEMICOLON:
+ // tolerate only whitespace and embedded comments
+ if (c == ';') {
+ if (!pref_DoCallback(aPS)) {
+ return false;
+ }
+ state = PREF_PARSE_INIT;
+ } else if (c == '/') {
+ aPS->nextstate = state; // return here when done with comment
+ state = PREF_PARSE_COMMENT_MAYBE_START;
+ } else if (!isspace(c)) {
+ pref_ReportParseProblem(
+ *aPS, "need space, comment or semicolon", lineNum, true);
+ NS_WARNING("malformed pref file");
+ return false;
+ }
+ break;
+
+ // eol parsing
case PREF_PARSE_UNTIL_EOL:
- /* need to handle mac, unix, or dos line endings.
- * PREF_PARSE_INIT will eat the next \n in case
- * we have \r\n. */
+ // Need to handle mac, unix, or dos line endings. PREF_PARSE_INIT will
+ // eat the next \n in case we have \r\n.
if (c == '\r' || c == '\n' || c == 0x1A) {
- state = ps->nextstate;
- ps->nextstate = PREF_PARSE_INIT; /* reset next state */
+ state = aPS->nextstate;
+ aPS->nextstate = PREF_PARSE_INIT; // reset next state
}
break;
}
}
- ps->state = state;
+ aPS->state = state;
return true;
}
#ifdef TEST_PREFREAD
static void
-pref_reader(void* closure,
- const char* pref,
- PrefValue val,
- PrefType type,
- bool defPref)
+pref_reader(void* aClosure,
+ const char* aPref,
+ PrefValue aVal,
+ PrefType aType,
+ bool aDefPref)
{
- printf("%spref(\"%s\", ", defPref ? "" : "user_", pref);
- switch (type) {
+ printf("%spref(\"%s\", ", aDefPref ? "" : "user_", aPref);
+ switch (aType) {
case PREF_STRING:
- printf("\"%s\");\n", val.stringVal);
+ printf("\"%s\");\n", aVal.stringVal);
break;
case PREF_INT:
- printf("%i);\n", val.intVal);
+ printf("%i);\n", aVal.intVal);
break;
case PREF_BOOL:
- printf("%s);\n", val.boolVal == false ? "false" : "true");
+ printf("%s);\n", aVal.boolVal == false ? "false" : "true");
break;
}
}
int
-main(int argc, char** argv)
+main(int aArgc, char** aArgv)
{
- PrefParseState ps;
- char buf[4096]; /* i/o buffer */
+ PrefParseState aPS;
+ char buf[4096]; // i/o buffer
FILE* fp;
int n;
- if (argc == 1) {
+ if (aArgc == 1) {
printf("usage: prefread file.js\n");
return -1;
}
- fp = fopen(argv[1], "r");
+ fp = fopen(aArgv[1], "r");
if (!fp) {
printf("failed to open file\n");
return -1;
}
- PREF_InitParseState(&ps, pref_reader, nullptr, nullptr);
+ PREF_InitParseState(&aPS, pref_reader, nullptr, nullptr);
- while ((n = fread(buf, 1, sizeof(buf), fp)) > 0)
- PREF_ParseBuf(&ps, buf, n);
+ while ((n = fread(buf, 1, sizeof(buf), fp)) > 0) {
+ PREF_ParseBuf(&aPS, buf, n);
+ }
- PREF_FinalizeParseState(&ps);
+ PREF_FinalizeParseState(&aPS);
fclose(fp);
return 0;
}
-#endif /* TEST_PREFREAD */
+#endif // TEST_PREFREAD