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/BundleTest | |
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/BundleTest')
-rw-r--r-- | Tests/BundleTest/BundleLib.cxx | 31 | ||||
-rw-r--r-- | Tests/BundleTest/BundleTest.cxx | 8 |
2 files changed, 17 insertions, 22 deletions
diff --git a/Tests/BundleTest/BundleLib.cxx b/Tests/BundleTest/BundleLib.cxx index 54f9534..9ae802f 100644 --- a/Tests/BundleTest/BundleLib.cxx +++ b/Tests/BundleTest/BundleLib.cxx @@ -8,13 +8,12 @@ int fileExists(char* filename) { #ifndef R_OK -# define R_OK 04 +#define R_OK 04 #endif - if ( access(filename, R_OK) != 0 ) - { + if (access(filename, R_OK) != 0) { printf("Cannot find file: %s\n", filename); return 0; - } + } return 1; } @@ -28,18 +27,15 @@ int findBundleFile(char* exec, const char* file) printf("Process executable name: %s\n", exec); // Remove the executable name and directory name - for ( cc = strlen(nexec)-1; cc > 0; cc -- ) - { - if ( nexec[cc] == '/' ) - { + for (cc = strlen(nexec) - 1; cc > 0; cc--) { + if (nexec[cc] == '/') { nexec[cc] = 0; - if ( cnt == 1 ) - { + if (cnt == 1) { break; - } - cnt ++; } + cnt++; } + } printf("Process executable path: %s\n", nexec); sprintf(fpath, "%s/%s", nexec, file); printf("Check for file: %s\n", fpath); @@ -49,22 +45,19 @@ int findBundleFile(char* exec, const char* file) return res; } -int foo(char *exec) +int foo(char* exec) { // Call a CoreFoundation function... // CFBundleRef br = CFBundleGetMainBundle(); - (void) br; + (void)br; int res1 = findBundleFile(exec, "Resources/randomResourceFile.plist"); int res2 = findBundleFile(exec, "MacOS/SomeRandomFile.txt"); int res3 = findBundleFile(exec, "MacOS/README.rst"); - if ( !res1 || - !res2 || - !res3 ) - { + if (!res1 || !res2 || !res3) { return 1; - } + } return 0; } diff --git a/Tests/BundleTest/BundleTest.cxx b/Tests/BundleTest/BundleTest.cxx index a66d601..a5e8f59 100644 --- a/Tests/BundleTest/BundleTest.cxx +++ b/Tests/BundleTest/BundleTest.cxx @@ -8,13 +8,15 @@ int main(int argc, char* argv[]) { printf("Started with: %d arguments\n", argc); - // Call a CoreFoundation function... but pull in the link dependency on "-framework - // CoreFoundation" via CMake's dependency chaining mechanism. This code exists to + // Call a CoreFoundation function... but pull in the link dependency on + // "-framework + // CoreFoundation" via CMake's dependency chaining mechanism. This code + // exists to // verify that the chaining mechanism works with "-framework blah" style // link dependencies. // CFBundleRef br = CFBundleGetMainBundle(); - (void) br; + (void)br; return foo(argv[0]); } |