From 942e2c999ad021b8cbd5737a1b70c85871cabbe8 Mon Sep 17 00:00:00 2001 From: Christopher Dunn Date: Fri, 23 Jan 2015 11:03:55 -0600 Subject: [PATCH] unindent test-code --- src/jsontestrunner/main.cpp | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/src/jsontestrunner/main.cpp b/src/jsontestrunner/main.cpp index 46eb872..9891600 100644 --- a/src/jsontestrunner/main.cpp +++ b/src/jsontestrunner/main.cpp @@ -257,19 +257,21 @@ int main(int argc, const char* argv[]) { Json::Value root; exitCode = parseAndSaveValueTree( input, actualPath, "input", root, features, parseOnly); - if (exitCode == 0 && !parseOnly) { - std::string rewrite; - exitCode = rewriteValueTree(rewritePath, root, rewrite); - if (exitCode == 0) { - Json::Value rewriteRoot; - exitCode = parseAndSaveValueTree(rewrite, - rewriteActualPath, - "rewrite", - rewriteRoot, - features, - parseOnly); - } + if (exitCode != 0 || parseOnly) { + return exitCode; } + std::string rewrite; + exitCode = rewriteValueTree(rewritePath, root, rewrite); + if (exitCode =! 0) { + return exitCode; + } + Json::Value rewriteRoot; + exitCode = parseAndSaveValueTree(rewrite, + rewriteActualPath, + "rewrite", + rewriteRoot, + features, + parseOnly); } catch (const std::exception& e) { printf("Unhandled exception:\n%s\n", e.what());