summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTreehugger Robot <treehugger-gerrit@google.com>2021-03-04 06:03:56 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2021-03-04 06:03:56 +0000
commit78a488cd10a99aa7d2a3323ad9a0e36eee7337a5 (patch)
tree351ff397bee81d5a0d5137ff8d648eaabe5adebd
parent12acf151413de71e0a9e81fc6369e2643361cbfe (diff)
parent1c9baa3191fadacdcd89ac7837a0acdeb63b2c5f (diff)
Merge "Remove unused errorMessage"
-rw-r--r--tools/bit/make.cpp6
1 files changed, 2 insertions, 4 deletions
diff --git a/tools/bit/make.cpp b/tools/bit/make.cpp
index c39f49465054..2a88732b50b1 100644
--- a/tools/bit/make.cpp
+++ b/tools/bit/make.cpp
@@ -90,8 +90,7 @@ BuildVars::BuildVars(const string& outDir, const string& buildProduct,
Json::Value json;
Json::CharReaderBuilder builder;
- std::string errorMessage;
- if (!Json::parseFromStream(builder, stream, &json, &errorMessage)) {
+ if (!Json::parseFromStream(builder, stream, &json, /* errorMessage = */ nullptr)) {
return;
}
@@ -215,8 +214,7 @@ read_modules(const string& buildOut, const string& device, map<string,Module>* r
Json::Value json;
Json::CharReaderBuilder builder;
- std::string errorMessage;
- if (!Json::parseFromStream(builder, stream, &json, &errorMessage)) {
+ if (!Json::parseFromStream(builder, stream, &json, /* errorMessage = */ nullptr)) {
json_error(filename, "can't parse json format", quiet);
return;
}