diff options
author | Kitware Robot <kwrobot@kitware.com> | 2016-05-16 14:34:04 (GMT) |
---|---|---|
committer | Brad King <brad.king@kitware.com> | 2016-05-16 20:05:19 (GMT) |
commit | d9fd2f5402eeaa345691313658e02b51038f570b (patch) | |
tree | dca71b9a7e267f4c6300da3eb770415381726785 /Tests/CustomCommand | |
parent | 82df6deaafb36cbbfd450202bb20b320f637751a (diff) | |
download | CMake-d9fd2f5402eeaa345691313658e02b51038f570b.zip CMake-d9fd2f5402eeaa345691313658e02b51038f570b.tar.gz CMake-d9fd2f5402eeaa345691313658e02b51038f570b.tar.bz2 |
Revise C++ coding style using clang-format
Run the `Utilities/Scripts/clang-format.bash` script to update
all our C++ code to a new style defined by `.clang-format`.
Use `clang-format` version 3.8.
* If you reached this commit for a line in `git blame`, re-run the blame
operation starting at the parent of this commit to see older history
for the content.
* See the parent commit for instructions to rebase a change across this
style transition commit.
Diffstat (limited to 'Tests/CustomCommand')
-rw-r--r-- | Tests/CustomCommand/gen_redirect_in.c | 5 | ||||
-rw-r--r-- | Tests/CustomCommand/generator.cxx | 15 | ||||
-rw-r--r-- | Tests/CustomCommand/tcat.cxx | 5 | ||||
-rw-r--r-- | Tests/CustomCommand/wrapper.cxx | 32 |
4 files changed, 28 insertions, 29 deletions
diff --git a/Tests/CustomCommand/gen_redirect_in.c b/Tests/CustomCommand/gen_redirect_in.c index 8dd8f43..6af364b 100644 --- a/Tests/CustomCommand/gen_redirect_in.c +++ b/Tests/CustomCommand/gen_redirect_in.c @@ -1,5 +1,8 @@ #if 1 -int gen_redirect() { return 3; } +int gen_redirect() +{ + return 3; +} /* endif should be concatenated to generated file */ diff --git a/Tests/CustomCommand/generator.cxx b/Tests/CustomCommand/generator.cxx index cceac07..8281713 100644 --- a/Tests/CustomCommand/generator.cxx +++ b/Tests/CustomCommand/generator.cxx @@ -1,18 +1,17 @@ #include <stdio.h> -int main(int argc, char *argv[]) +int main(int argc, char* argv[]) { - if ( argc < 2 ) - { + if (argc < 2) { fprintf(stderr, "Usage: %s <file>\n", argv[0]); return 1; - } - FILE *fp = fopen(argv[1],"w"); + } + FILE* fp = fopen(argv[1], "w"); #ifdef GENERATOR_EXTERN - fprintf(fp,"int generated() { return 3; }\n"); + fprintf(fp, "int generated() { return 3; }\n"); #else - fprintf(fp,"extern int gen_redirect(void);\n"); - fprintf(fp,"int generated() { return gen_redirect(); }\n"); + fprintf(fp, "extern int gen_redirect(void);\n"); + fprintf(fp, "int generated() { return gen_redirect(); }\n"); #endif fclose(fp); return 0; diff --git a/Tests/CustomCommand/tcat.cxx b/Tests/CustomCommand/tcat.cxx index 89e3cb0..d010d14 100644 --- a/Tests/CustomCommand/tcat.cxx +++ b/Tests/CustomCommand/tcat.cxx @@ -3,9 +3,8 @@ int main() { int c; - while((c = getc(stdin), c != EOF)) - { + while ((c = getc(stdin), c != EOF)) { putc(c, stdout); - } + } return 0; } diff --git a/Tests/CustomCommand/wrapper.cxx b/Tests/CustomCommand/wrapper.cxx index 97912de..c380938 100644 --- a/Tests/CustomCommand/wrapper.cxx +++ b/Tests/CustomCommand/wrapper.cxx @@ -1,30 +1,28 @@ #include <stdio.h> #include <string.h> -int main(int argc, char *argv[]) +int main(int argc, char* argv[]) { - if ( argc < 3 ) - { + if (argc < 3) { fprintf(stderr, "Usage: %s <file1> <file2>\n", argv[0]); return 1; - } - FILE *fp = fopen(argv[1],"w"); - fprintf(fp,"extern int wrapped_help();\n"); - fprintf(fp,"int wrapped() { return wrapped_help(); }\n"); + } + FILE* fp = fopen(argv[1], "w"); + fprintf(fp, "extern int wrapped_help();\n"); + fprintf(fp, "int wrapped() { return wrapped_help(); }\n"); fclose(fp); - fp = fopen(argv[2],"w"); - fprintf(fp,"int wrapped_help() { return 5; }\n"); + fp = fopen(argv[2], "w"); + fprintf(fp, "int wrapped_help() { return 5; }\n"); fclose(fp); #ifdef CMAKE_INTDIR - const char* cfg = (argc >= 4)? argv[3] : ""; - if(strcmp(cfg, CMAKE_INTDIR) != 0) - { - fprintf(stderr, - "Did not receive expected configuration argument:\n" - " expected [" CMAKE_INTDIR "]\n" - " received [%s]\n", cfg); + const char* cfg = (argc >= 4) ? argv[3] : ""; + if (strcmp(cfg, CMAKE_INTDIR) != 0) { + fprintf(stderr, "Did not receive expected configuration argument:\n" + " expected [" CMAKE_INTDIR "]\n" + " received [%s]\n", + cfg); return 1; - } + } #endif return 0; } |