diff options
author | Cary Clark <caryclark@skia.org> | 2018-07-18 15:10:08 -0400 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-07-18 19:42:52 +0000 |
commit | d789550da4bf666ca11487ddcb5dd6b9b13ec3d7 (patch) | |
tree | bf58fd88ff28d0ecb52a4b34d2e1a8739f403f59 /tools/bookmaker/parserCommon.cpp | |
parent | 5ed4df358318161edf7e50b7f04ed972651af913 (diff) |
add more fiddle hash checks
Convert some of bookmaker to use real json instead
of rolling its own. Also check to see if all
hashes are read.
TBR=jcgregario@google.com
Docs-Preview: https://skia.org/?cl=142166
Bug: skia:8151
Change-Id: Ib35ecd69648faec3522903e0b552d37b04b73f8b
Reviewed-on: https://skia-review.googlesource.com/142166
Commit-Queue: Cary Clark <caryclark@skia.org>
Auto-Submit: Cary Clark <caryclark@skia.org>
Reviewed-by: Cary Clark <caryclark@skia.org>
Diffstat (limited to 'tools/bookmaker/parserCommon.cpp')
-rw-r--r-- | tools/bookmaker/parserCommon.cpp | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/tools/bookmaker/parserCommon.cpp b/tools/bookmaker/parserCommon.cpp index 33bf14918e..fb00b167a8 100644 --- a/tools/bookmaker/parserCommon.cpp +++ b/tools/bookmaker/parserCommon.cpp @@ -392,7 +392,7 @@ bool StatusIter::next(string* str) { return true; } -bool StatusIter::parseFromFile(const char* path) { +bool JsonCommon::parseFromFile(const char* path) { sk_sp<SkData> json(SkData::MakeFromFileName(path)); if (!json) { SkDebugf("file %s:\n", path); @@ -400,7 +400,7 @@ bool StatusIter::parseFromFile(const char* path) { } Json::Reader reader; const char* data = (const char*)json->data(); - if (!reader.parse(data, data+json->size(), fRoot)) { + if (!reader.parse(data, data + json->size(), fRoot)) { SkDebugf("file %s:\n", path); return this->reportError<bool>("file not parsable"); } @@ -409,6 +409,3 @@ bool StatusIter::parseFromFile(const char* path) { return true; } -void StatusIter::reset() { - fStack.clear(); -} |