tidy-up: indent, whitespace, comment in sources
Cherry-picked from #14692 Closes #14995
This commit is contained in:
parent
8afdf8dc5a
commit
1064dfa86a
@ -21,7 +21,6 @@
|
|||||||
* SPDX-License-Identifier: curl
|
* SPDX-License-Identifier: curl
|
||||||
*
|
*
|
||||||
***************************************************************************/
|
***************************************************************************/
|
||||||
/* lib/curl_config.h.in. Generated somehow by cmake. */
|
|
||||||
|
|
||||||
/* Location of default ca bundle */
|
/* Location of default ca bundle */
|
||||||
#cmakedefine CURL_CA_BUNDLE "${CURL_CA_BUNDLE}"
|
#cmakedefine CURL_CA_BUNDLE "${CURL_CA_BUNDLE}"
|
||||||
|
|||||||
@ -66,13 +66,4 @@
|
|||||||
#include "version_win32.h"
|
#include "version_win32.h"
|
||||||
/* "version_win32.h" provides curlx_verify_windows_version() */
|
/* "version_win32.h" provides curlx_verify_windows_version() */
|
||||||
|
|
||||||
/* Now setup curlx_ * names for the functions that are to become curlx_ and
|
|
||||||
be removed from a future libcurl official API:
|
|
||||||
curlx_getenv
|
|
||||||
curlx_mprintf (and its variations)
|
|
||||||
curlx_strcasecompare
|
|
||||||
curlx_strncasecompare
|
|
||||||
|
|
||||||
*/
|
|
||||||
|
|
||||||
#endif /* HEADER_CURL_CURLX_H */
|
#endif /* HEADER_CURL_CURLX_H */
|
||||||
|
|||||||
@ -71,7 +71,7 @@
|
|||||||
pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE); \
|
pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE); \
|
||||||
pthread_mutex_init(lock, &attr); \
|
pthread_mutex_init(lock, &attr); \
|
||||||
pthread_mutexattr_destroy(&attr); \
|
pthread_mutexattr_destroy(&attr); \
|
||||||
}while(0)
|
} while(0)
|
||||||
#define msh3_lock_uninitialize(lock) pthread_mutex_destroy(lock)
|
#define msh3_lock_uninitialize(lock) pthread_mutex_destroy(lock)
|
||||||
#define msh3_lock_acquire(lock) pthread_mutex_lock(lock)
|
#define msh3_lock_acquire(lock) pthread_mutex_lock(lock)
|
||||||
#define msh3_lock_release(lock) pthread_mutex_unlock(lock)
|
#define msh3_lock_release(lock) pthread_mutex_unlock(lock)
|
||||||
|
|||||||
@ -2924,7 +2924,7 @@ CURLcode Curl_ossl_add_session(struct Curl_cfilter *cf,
|
|||||||
|
|
||||||
Curl_ssl_sessionid_lock(data);
|
Curl_ssl_sessionid_lock(data);
|
||||||
result = Curl_ssl_set_sessionid(cf, data, peer, der_session_buf,
|
result = Curl_ssl_set_sessionid(cf, data, peer, der_session_buf,
|
||||||
der_session_size, ossl_session_free);
|
der_session_size, ossl_session_free);
|
||||||
Curl_ssl_sessionid_unlock(data);
|
Curl_ssl_sessionid_unlock(data);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -4002,8 +4002,8 @@ CURLcode Curl_ossl_ctx_init(struct ossl_ctx *octx,
|
|||||||
octx->reused_session = TRUE;
|
octx->reused_session = TRUE;
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
Curl_ssl_sessionid_unlock(data);
|
Curl_ssl_sessionid_unlock(data);
|
||||||
return CURLE_SSL_CONNECT_ERROR;
|
return CURLE_SSL_CONNECT_ERROR;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
Curl_ssl_sessionid_unlock(data);
|
Curl_ssl_sessionid_unlock(data);
|
||||||
|
|||||||
@ -48,7 +48,7 @@ dnl a c89 compiler and does not support K&R.
|
|||||||
|
|
||||||
m4_define([AC_LANG_PROGRAM(C)],
|
m4_define([AC_LANG_PROGRAM(C)],
|
||||||
[$1
|
[$1
|
||||||
int main (void)
|
int main(void)
|
||||||
{
|
{
|
||||||
$2
|
$2
|
||||||
;
|
;
|
||||||
|
|||||||
@ -377,7 +377,7 @@ static CURLcode pre_transfer(struct GlobalConfig *global,
|
|||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
per->infd = open(per->uploadfile, O_RDONLY | O_BINARY,
|
per->infd = open(per->uploadfile, O_RDONLY | O_BINARY,
|
||||||
"rfm=stmlf", "ctx=stm");
|
"rfm=stmlf", "ctx=stm");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if(per->infd == -1)
|
if(per->infd == -1)
|
||||||
|
|||||||
@ -214,11 +214,11 @@ CURLcode test(char *URL)
|
|||||||
res = ctx[i].result;
|
res = ctx[i].result;
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
struct curl_slist *item = ctx[i].contents;
|
struct curl_slist *item = ctx[i].contents;
|
||||||
while(item) {
|
while(item) {
|
||||||
printf("%s", item->data);
|
printf("%s", item->data);
|
||||||
item = item->next;
|
item = item->next;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
curl_slist_free_all(ctx[i].contents);
|
curl_slist_free_all(ctx[i].contents);
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1121,6 +1121,7 @@ if($error) {
|
|||||||
exit 1;
|
exit 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
#***************************************************************************
|
#***************************************************************************
|
||||||
# Initialize client sftp config with options actually supported.
|
# Initialize client sftp config with options actually supported.
|
||||||
#
|
#
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user