Skip to content

Commit 3fdf111

Browse files
committed
json-parser: drop the redundant jsonValid flag
No change in behavior intended by this commit.
1 parent 439dce2 commit 3fdf111

File tree

1 file changed

+7
-11
lines changed

1 file changed

+7
-11
lines changed

src/json-parser.cc

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -66,19 +66,15 @@ class CovTreeDecoder: public AbstractTreeDecoder {
6666

6767
struct JsonParser::Private {
6868
InStream &input;
69-
bool jsonValid;
70-
AbstractTreeDecoder *decoder;
69+
AbstractTreeDecoder *decoder = nullptr;
7170
pt::ptree root;
72-
const pt::ptree *defList;
71+
const pt::ptree *defList = nullptr;
7372
pt::ptree::const_iterator defIter;
74-
int defNumber;
73+
int defNumber = 0;
7574
TScanProps scanProps;
7675

7776
Private(InStream &input):
78-
input(input),
79-
jsonValid(false),
80-
decoder(0),
81-
defNumber(0)
77+
input(input)
8278
{
8379
}
8480

@@ -127,8 +123,8 @@ JsonParser::JsonParser(InStream &input):
127123
d->decoder->readRoot(&d->defList, node);
128124

129125
// initialize the traversal through the list of defects/issues
130-
d->defIter = d->defList->begin();
131-
d->jsonValid = true;
126+
if (d->defList)
127+
d->defIter = d->defList->begin();
132128
}
133129
catch (pt::file_parser_error &e) {
134130
d->input.handleError(e.message(), e.line());
@@ -172,7 +168,7 @@ bool JsonParser::Private::readNext(Defect *def)
172168

173169
bool JsonParser::getNext(Defect *def)
174170
{
175-
if (!d->jsonValid)
171+
if (!d->defList)
176172
return false;
177173

178174
// error recovery loop

0 commit comments

Comments
 (0)