diff options
| author | Kitware Robot <kwrobot@kitware.com> | 2018-06-01 13:53:41 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2018-06-01 13:53:42 (GMT) |
| commit | d7204e649ed4ebb19bb341b4e49eb51514364922 (patch) | |
| tree | d9ac3ded5ae6899be7188795011743fe3e6da0a6 /Source/cmCurl.cxx | |
| parent | 12fed3edb107c949671043196fa94c542b45452a (diff) | |
| download | CMake-d7204e649ed4ebb19bb341b4e49eb51514364922.zip CMake-d7204e649ed4ebb19bb341b4e49eb51514364922.tar.gz CMake-d7204e649ed4ebb19bb341b4e49eb51514364922.tar.bz2 | |
Revise C++ coding style using clang-format-6.0
Run the `clang-format.bash` script to update all our C and C++ code to a
new style defined by `.clang-format`. Use `clang-format` version 6.0.
* 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 'Source/cmCurl.cxx')
| -rw-r--r-- | Source/cmCurl.cxx | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/Source/cmCurl.cxx b/Source/cmCurl.cxx index 8ef8bff..3360323 100644 --- a/Source/cmCurl.cxx +++ b/Source/cmCurl.cxx @@ -6,13 +6,13 @@ #if !defined(CMAKE_USE_SYSTEM_CURL) && !defined(_WIN32) && \ !defined(__APPLE__) && !defined(CURL_CA_BUNDLE) && !defined(CURL_CA_PATH) -#define CMAKE_FIND_CAFILE -#include "cmSystemTools.h" +# define CMAKE_FIND_CAFILE +# include "cmSystemTools.h" #endif // curl versions before 7.21.5 did not provide this error code #if defined(LIBCURL_VERSION_NUM) && LIBCURL_VERSION_NUM < 0x071505 -#define CURLE_NOT_BUILT_IN 4 +# define CURLE_NOT_BUILT_IN 4 #endif #define check_curl_result(result, errstr) \ @@ -30,28 +30,28 @@ std::string cmCurlSetCAInfo(::CURL* curl, const char* cafile) check_curl_result(res, "Unable to set TLS/SSL Verify CAINFO: "); } #ifdef CMAKE_FIND_CAFILE -#define CMAKE_CAFILE_FEDORA "/etc/pki/tls/certs/ca-bundle.crt" +# define CMAKE_CAFILE_FEDORA "/etc/pki/tls/certs/ca-bundle.crt" else if (cmSystemTools::FileExists(CMAKE_CAFILE_FEDORA, true)) { ::CURLcode res = ::curl_easy_setopt(curl, CURLOPT_CAINFO, CMAKE_CAFILE_FEDORA); check_curl_result(res, "Unable to set TLS/SSL Verify CAINFO: "); } -#undef CMAKE_CAFILE_FEDORA +# undef CMAKE_CAFILE_FEDORA else { -#define CMAKE_CAFILE_COMMON "/etc/ssl/certs/ca-certificates.crt" +# define CMAKE_CAFILE_COMMON "/etc/ssl/certs/ca-certificates.crt" if (cmSystemTools::FileExists(CMAKE_CAFILE_COMMON, true)) { ::CURLcode res = ::curl_easy_setopt(curl, CURLOPT_CAINFO, CMAKE_CAFILE_COMMON); check_curl_result(res, "Unable to set TLS/SSL Verify CAINFO: "); } -#undef CMAKE_CAFILE_COMMON -#define CMAKE_CAPATH_COMMON "/etc/ssl/certs" +# undef CMAKE_CAFILE_COMMON +# define CMAKE_CAPATH_COMMON "/etc/ssl/certs" if (cmSystemTools::FileIsDirectory(CMAKE_CAPATH_COMMON)) { ::CURLcode res = ::curl_easy_setopt(curl, CURLOPT_CAPATH, CMAKE_CAPATH_COMMON); check_curl_result(res, "Unable to set TLS/SSL Verify CAPATH: "); } -#undef CMAKE_CAPATH_COMMON +# undef CMAKE_CAPATH_COMMON } #endif return e; |