diff --git a/include/curl/curl.h b/include/curl/curl.h index 195ed14f00..4e2cf9ada5 100644 --- a/include/curl/curl.h +++ b/include/curl/curl.h @@ -102,7 +102,7 @@ #include #endif -#ifdef __cplusplus +#ifdef __cplusplus extern "C" { #endif @@ -3302,7 +3302,7 @@ CURL_EXTERN CURLcode curl_easy_ssls_export(CURL *handle, void *userptr); -#ifdef __cplusplus +#ifdef __cplusplus } /* end of extern "C" */ #endif diff --git a/include/curl/easy.h b/include/curl/easy.h index 56f8060e04..fa13564937 100644 --- a/include/curl/easy.h +++ b/include/curl/easy.h @@ -23,7 +23,7 @@ * SPDX-License-Identifier: curl * ***************************************************************************/ -#ifdef __cplusplus +#ifdef __cplusplus extern "C" { #endif @@ -118,7 +118,7 @@ CURL_EXTERN CURLcode curl_easy_send(CURL *curl, const void *buffer, */ CURL_EXTERN CURLcode curl_easy_upkeep(CURL *curl); -#ifdef __cplusplus +#ifdef __cplusplus } /* end of extern "C" */ #endif diff --git a/include/curl/header.h b/include/curl/header.h index 8df11e1e42..7465274b9c 100644 --- a/include/curl/header.h +++ b/include/curl/header.h @@ -24,7 +24,7 @@ * ***************************************************************************/ -#ifdef __cplusplus +#ifdef __cplusplus extern "C" { #endif diff --git a/include/curl/mprintf.h b/include/curl/mprintf.h index 19b71c38b1..9272e74891 100644 --- a/include/curl/mprintf.h +++ b/include/curl/mprintf.h @@ -28,7 +28,7 @@ #include /* needed for FILE */ #include "curl.h" /* for CURL_EXTERN */ -#ifdef __cplusplus +#ifdef __cplusplus extern "C" { #endif @@ -78,7 +78,7 @@ CURL_EXTERN char *curl_mvaprintf(const char *format, va_list args) #undef CURL_TEMP_PRINTF -#ifdef __cplusplus +#ifdef __cplusplus } /* end of extern "C" */ #endif diff --git a/include/curl/multi.h b/include/curl/multi.h index 42469bb565..aa1291001f 100644 --- a/include/curl/multi.h +++ b/include/curl/multi.h @@ -50,7 +50,7 @@ */ #include "curl.h" -#ifdef __cplusplus +#ifdef __cplusplus extern "C" { #endif diff --git a/include/curl/options.h b/include/curl/options.h index 1ed76a95c6..77cab7768f 100644 --- a/include/curl/options.h +++ b/include/curl/options.h @@ -24,7 +24,7 @@ * ***************************************************************************/ -#ifdef __cplusplus +#ifdef __cplusplus extern "C" { #endif diff --git a/include/curl/urlapi.h b/include/curl/urlapi.h index b4a6e5d567..34c11a6bb7 100644 --- a/include/curl/urlapi.h +++ b/include/curl/urlapi.h @@ -26,7 +26,7 @@ #include "curl.h" -#ifdef __cplusplus +#ifdef __cplusplus extern "C" { #endif diff --git a/include/curl/websockets.h b/include/curl/websockets.h index afb86b4ebc..1c4d5720e3 100644 --- a/include/curl/websockets.h +++ b/include/curl/websockets.h @@ -24,7 +24,7 @@ * ***************************************************************************/ -#ifdef __cplusplus +#ifdef __cplusplus extern "C" { #endif @@ -78,7 +78,7 @@ CURL_EXTERN CURLcode curl_ws_send(CURL *curl, const void *buffer, CURL_EXTERN const struct curl_ws_frame *curl_ws_meta(CURL *curl); -#ifdef __cplusplus +#ifdef __cplusplus } #endif diff --git a/lib/curl_addrinfo.c b/lib/curl_addrinfo.c index 8600f90778..c89f5ddc6b 100644 --- a/lib/curl_addrinfo.c +++ b/lib/curl_addrinfo.c @@ -68,7 +68,7 @@ */ #if defined(__INTEL_COMPILER) && (__INTEL_COMPILER == 910) && \ - defined(__OPTIMIZE__) && defined(__unix__) && defined(__i386__) + defined(__OPTIMIZE__) && defined(__unix__) && defined(__i386__) /* workaround icc 9.1 optimizer issue */ # define vqualifier volatile #else diff --git a/lib/curl_setup.h b/lib/curl_setup.h index f5e16d7633..fc5359d1b4 100644 --- a/lib/curl_setup.h +++ b/lib/curl_setup.h @@ -331,10 +331,10 @@ #define CURL_CONC_MACROS(A,B) CURL_CONC_MACROS_(A,B) /* curl uses its own printf() function internally. It understands the GNU - * format. Use this format, so that is matches the GNU format attribute we + * format. Use this format, so that it matches the GNU format attribute we * use with the MinGW compiler, allowing it to verify them at compile-time. */ -#ifdef __MINGW32__ +#ifdef __MINGW32__ # undef CURL_FORMAT_CURL_OFF_T # undef CURL_FORMAT_CURL_OFF_TU # define CURL_FORMAT_CURL_OFF_T "lld" diff --git a/lib/easy.c b/lib/easy.c index 2df2ef475f..e79171a3ae 100644 --- a/lib/easy.c +++ b/lib/easy.c @@ -822,7 +822,6 @@ static CURLcode easy_perform(struct Curl_easy *data, bool events) return result; } - /* * curl_easy_perform() is the external interface that performs a blocking * transfer as previously setup. @@ -841,7 +840,6 @@ CURLcode curl_easy_perform_ev(struct Curl_easy *data) { return easy_perform(data, TRUE); } - #endif /* diff --git a/lib/file.c b/lib/file.c index b88f612305..e49a3c0fe2 100644 --- a/lib/file.c +++ b/lib/file.c @@ -348,7 +348,7 @@ static CURLcode file_upload(struct Curl_easy *data, mode |= O_TRUNC; #if (defined(ANDROID) || defined(__ANDROID__)) && \ - (defined(__i386__) || defined(__arm__)) + (defined(__i386__) || defined(__arm__)) fd = open(file->path, mode, (mode_t)data->set.new_file_perms); #else fd = open(file->path, mode, data->set.new_file_perms); diff --git a/lib/fileinfo.c b/lib/fileinfo.c index c3439af341..47cdb102e3 100644 --- a/lib/fileinfo.c +++ b/lib/fileinfo.c @@ -23,7 +23,9 @@ ***************************************************************************/ #include "curl_setup.h" + #ifndef CURL_DISABLE_FTP + #include "strdup.h" #include "fileinfo.h" #include "curl_memory.h" @@ -43,4 +45,5 @@ void Curl_fileinfo_cleanup(struct fileinfo *finfo) curlx_dyn_free(&finfo->buf); free(finfo); } + #endif diff --git a/lib/fopen.c b/lib/fopen.c index 38b87f326e..b28977317a 100644 --- a/lib/fopen.c +++ b/lib/fopen.c @@ -136,7 +136,7 @@ CURLcode Curl_fopen(struct Curl_easy *data, const char *filename, result = CURLE_WRITE_ERROR; #if (defined(ANDROID) || defined(__ANDROID__)) && \ - (defined(__i386__) || defined(__arm__)) + (defined(__i386__) || defined(__arm__)) fd = open(tempstore, O_WRONLY | O_CREAT | O_EXCL, (mode_t)(0600|sb.st_mode)); #else fd = open(tempstore, O_WRONLY | O_CREAT | O_EXCL, 0600|sb.st_mode);