From bd9e551c1a13f566e6ffe8cdd1262b7628ed5330 Mon Sep 17 00:00:00 2001 From: Daniel Pfeifer Date: Fri, 10 Jun 2016 18:31:30 +0200 Subject: [PATCH] PseudoMemcheck: revise style with clang-format. Rename memtester.cxx.in to memtester.cxx, run clang-format, then restore the original name. Fix the @_retval@ placeholder that was broken by clang-format. --- .../CMakeLib/PseudoMemcheck/memtester.cxx.in | 22 +++++++------------ 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/Tests/CMakeLib/PseudoMemcheck/memtester.cxx.in b/Tests/CMakeLib/PseudoMemcheck/memtester.cxx.in index b141942c1..9958021a9 100644 --- a/Tests/CMakeLib/PseudoMemcheck/memtester.cxx.in +++ b/Tests/CMakeLib/PseudoMemcheck/memtester.cxx.in @@ -4,8 +4,7 @@ #define RETVAL @_retval@ -int -main(int ac, char **av) +int main(int ac, char** av) { cmsys::Encoding::CommandLineArguments args = cmsys::Encoding::CommandLineArguments::Main(ac, av); @@ -24,31 +23,26 @@ main(int ac, char **av) #else logarg = "-log-file="; #endif - else if (exename.find("BC") != exename.npos) - { + else if (exename.find("BC") != exename.npos) { nextarg = true; logarg = "/X"; - } + } if (!logarg.empty()) { std::string logfile; for (int i = 1; i < argc; i++) { std::string arg = argv[i]; - if (arg.find(logarg) == 0) - { - if (nextarg) - { + if (arg.find(logarg) == 0) { + if (nextarg) { if (i == argc - 1) return 1; // invalid command line logfile = argv[i + 1]; - } - else - { + } else { logfile = arg.substr(logarg.length()); - } - // keep searching, it may be overridden later to provoke an error } + // keep searching, it may be overridden later to provoke an error } + } if (!logfile.empty()) cmSystemTools::Touch(logfile, true);