0ac18d40c8
Modern editors provide plenty of ways to visually separate functions.
Drop the explicit comments that previously served this purpose.
Use the following command to automate the change:
$ git ls-files -z -- \
"*.c" "*.cc" "*.cpp" "*.cxx" "*.h" "*.hh" "*.hpp" "*.hxx" |
egrep -z -v "^Source/cmCommandArgumentLexer\." |
egrep -z -v "^Source/cmCommandArgumentParser(\.y|\.cxx|Tokens\.h)" |
egrep -z -v "^Source/cmDependsJavaLexer\." |
egrep -z -v "^Source/cmDependsJavaParser(\.y|\.cxx|Tokens\.h)" |
egrep -z -v "^Source/cmExprLexer\." |
egrep -z -v "^Source/cmExprParser(\.y|\.cxx|Tokens\.h)" |
egrep -z -v "^Source/cmFortranLexer\." |
egrep -z -v "^Source/cmFortranParser(\.y|\.cxx|Tokens\.h)" |
egrep -z -v "^Source/cmListFileLexer\." |
egrep -z -v "^Source/cm_sha2" |
egrep -z -v "^Source/(kwsys|CursesDialog/form)/" |
egrep -z -v "^Utilities/(KW|cm).*/" |
xargs -0 sed -i '/^\(\/\/---*\|\/\*---*\*\/\)$/ {d;}'
This avoids modifying third-party sources and generated sources.
70 lines
2.6 KiB
C++
70 lines
2.6 KiB
C++
/*============================================================================
|
|
CMake - Cross Platform Makefile Generator
|
|
Copyright 2000-2015 Kitware, Inc., Insight Software Consortium
|
|
|
|
Distributed under the OSI-approved BSD License (the "License");
|
|
see accompanying file Copyright.txt for details.
|
|
|
|
This software is distributed WITHOUT ANY WARRANTY; without even the
|
|
implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
|
|
See the License for more information.
|
|
============================================================================*/
|
|
#include "cmCurl.h"
|
|
|
|
#include "cmSystemTools.h"
|
|
|
|
// 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
|
|
#endif
|
|
|
|
#define check_curl_result(result, errstr) \
|
|
if (result != CURLE_OK && result != CURLE_NOT_BUILT_IN) \
|
|
{ \
|
|
e += e.empty()? "" : "\n"; \
|
|
e += errstr; \
|
|
e += ::curl_easy_strerror(result); \
|
|
}
|
|
|
|
std::string cmCurlSetCAInfo(::CURL *curl, const char* cafile)
|
|
{
|
|
std::string e;
|
|
if(cafile && *cafile)
|
|
{
|
|
::CURLcode res = ::curl_easy_setopt(curl, CURLOPT_CAINFO, cafile);
|
|
check_curl_result(res, "Unable to set TLS/SSL Verify CAINFO: ");
|
|
}
|
|
#if !defined(CMAKE_USE_SYSTEM_CURL) && \
|
|
!defined(_WIN32) && !defined(__APPLE__) && \
|
|
!defined(CURL_CA_BUNDLE) && !defined(CURL_CA_PATH)
|
|
# 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
|
|
else
|
|
{
|
|
# 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"
|
|
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
|
|
}
|
|
#endif
|
|
return e;
|
|
}
|