From 05810a760761a3e341395d8d0a7078db5b142725 Mon Sep 17 00:00:00 2001 From: Christopher Dunn Date: Fri, 23 Jan 2015 11:06:27 -0600 Subject: [PATCH] cleaner --- src/jsontestrunner/main.cpp | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/src/jsontestrunner/main.cpp b/src/jsontestrunner/main.cpp index 9891600..0b2f8e2 100644 --- a/src/jsontestrunner/main.cpp +++ b/src/jsontestrunner/main.cpp @@ -257,21 +257,20 @@ int main(int argc, const char* argv[]) { Json::Value root; exitCode = parseAndSaveValueTree( input, actualPath, "input", root, features, parseOnly); - if (exitCode != 0 || parseOnly) { + if (exitCode || parseOnly) { return exitCode; } std::string rewrite; exitCode = rewriteValueTree(rewritePath, root, rewrite); - if (exitCode =! 0) { + if (exitCode) { return exitCode; } Json::Value rewriteRoot; - exitCode = parseAndSaveValueTree(rewrite, - rewriteActualPath, - "rewrite", - rewriteRoot, - features, - parseOnly); + exitCode = parseAndSaveValueTree( + rewrite, rewriteActualPath, "rewrite", rewriteRoot, features, parseOnly); + if (exitCode) { + return exitCode; + } } catch (const std::exception& e) { printf("Unhandled exception:\n%s\n", e.what());