checksrc: move open braces to comply with function declaration style

This commit is contained in:
Daniel Stenberg 2016-11-23 08:49:04 +01:00
parent 80e7cfeb87
commit 6832c1d4b2
13 changed files with 78 additions and 65 deletions

View File

@ -94,7 +94,8 @@ typedef struct _SockInfo {
} SockInfo;
/* Die if we get a bad CURLMcode somewhere */
static void mcode_or_die(const char *where, CURLMcode code) {
static void mcode_or_die(const char *where, CURLMcode code)
{
if(CURLM_OK != code) {
const char *s;
switch (code) {

View File

@ -48,8 +48,8 @@
* For libcurl static library release builds no overriding takes place.
*/
int Curl_gethostname(char *name, GETHOSTNAME_TYPE_ARG2 namelen) {
int Curl_gethostname(char *name, GETHOSTNAME_TYPE_ARG2 namelen)
{
#ifndef HAVE_GETHOSTNAME
/* Allow compilation and return failure when unavailable */

View File

@ -1427,7 +1427,8 @@ int Curl_FormInit(struct Form *form, struct FormData *formdata)
*
*/
# define fopen_read vmsfopenread
static FILE * vmsfopenread(const char *file, const char *mode) {
static FILE * vmsfopenread(const char *file, const char *mode)
{
struct_stat statbuf;
int result;

View File

@ -225,7 +225,8 @@ int Curl_http2_ver(char *p, size_t len)
https://tools.ietf.org/html/rfc7540#page-77
nghttp2_error_code enums are identical.
*/
const char *Curl_http2_strerror(uint32_t err) {
const char *Curl_http2_strerror(uint32_t err)
{
#ifndef NGHTTP2_HAS_HTTP2_STRERROR
const char *str[] = {
"NO_ERROR", /* 0x0 */
@ -1578,7 +1579,8 @@ static ssize_t http2_recv(struct connectdata *conn, int sockindex,
* Parse the tokens as separated by comma and surrounded by whitespace.
* Returns TRUE if found or FALSE if not.
*/
static bool contains_trailers(const char *p, size_t len) {
static bool contains_trailers(const char *p, size_t len)
{
const char *end = p + len;
for(;;) {
for(; p != end && (*p == ' ' || *p == '\t'); ++p)

View File

@ -88,7 +88,8 @@ name_to_level(const char *name)
/* Convert a protocol |level| to its char representation.
We take an int to catch programming mistakes. */
static char level_to_char(int level) {
static char level_to_char(int level)
{
switch(level) {
case PROT_CLEAR:
return 'C';

View File

@ -138,48 +138,48 @@ static char *vms_getenv(const char *envvar)
static struct passwd vms_passwd_cache;
static struct passwd * vms_getpwuid(uid_t uid) {
struct passwd * my_passwd;
static struct passwd * vms_getpwuid(uid_t uid)
{
struct passwd * my_passwd;
/* Hack needed to support 64 bit builds, decc_getpwnam is 32 bit only */
#ifdef __DECC
# if __INITIAL_POINTER_SIZE
__char_ptr32 unix_path;
__char_ptr32 unix_path;
# else
char *unix_path;
char *unix_path;
# endif
#else
char *unix_path;
char *unix_path;
#endif
my_passwd = decc_getpwuid(uid);
if(my_passwd == NULL) {
return my_passwd;
}
my_passwd = decc_getpwuid(uid);
if(my_passwd == NULL) {
return my_passwd;
}
unix_path = vms_translate_path(my_passwd->pw_dir);
unix_path = vms_translate_path(my_passwd->pw_dir);
if((long)unix_path <= 0) {
/* We can not translate it, so return the original string */
return my_passwd;
}
if((long)unix_path <= 0) {
/* We can not translate it, so return the original string */
return my_passwd;
}
/* If no changes needed just return it */
if(unix_path == my_passwd->pw_dir) {
return my_passwd;
}
/* If no changes needed just return it */
if(unix_path == my_passwd->pw_dir) {
return my_passwd;
}
/* Need to copy the structure returned */
/* Since curl is only using pw_dir, no need to fix up *
/* the pw_shell when running under Bash */
vms_passwd_cache.pw_name = my_passwd->pw_name;
vms_passwd_cache.pw_uid = my_passwd->pw_uid;
vms_passwd_cache.pw_gid = my_passwd->pw_uid;
vms_passwd_cache.pw_dir = unix_path;
vms_passwd_cache.pw_shell = my_passwd->pw_shell;
/* Need to copy the structure returned */
/* Since curl is only using pw_dir, no need to fix up */
/* the pw_shell when running under Bash */
vms_passwd_cache.pw_name = my_passwd->pw_name;
vms_passwd_cache.pw_uid = my_passwd->pw_uid;
vms_passwd_cache.pw_gid = my_passwd->pw_uid;
vms_passwd_cache.pw_dir = unix_path;
vms_passwd_cache.pw_shell = my_passwd->pw_shell;
return &vms_passwd_cache;
return &vms_passwd_cache;
}
#ifdef __DECC

View File

@ -219,7 +219,8 @@ static OSStatus SocketWrite(SSLConnectionRef connection,
return ortn;
}
CF_INLINE const char *SSLCipherNameForNumber(SSLCipherSuite cipher) {
CF_INLINE const char *SSLCipherNameForNumber(SSLCipherSuite cipher)
{
switch (cipher) {
/* SSL version 3.0 */
case SSL_RSA_WITH_NULL_MD5:
@ -364,7 +365,8 @@ CF_INLINE const char *SSLCipherNameForNumber(SSLCipherSuite cipher) {
return "SSL_NULL_WITH_NULL_NULL";
}
CF_INLINE const char *TLSCipherNameForNumber(SSLCipherSuite cipher) {
CF_INLINE const char *TLSCipherNameForNumber(SSLCipherSuite cipher)
{
switch(cipher) {
/* TLS 1.0 with AES (RFC 3268) */
case TLS_RSA_WITH_AES_128_CBC_SHA:
@ -2449,7 +2451,8 @@ void Curl_darwinssl_md5sum(unsigned char *tmp, /* input */
(void)CC_MD5(tmp, (CC_LONG)tmplen, md5sum);
}
bool Curl_darwinssl_false_start(void) {
bool Curl_darwinssl_false_start(void)
{
#if CURL_BUILD_MAC_10_9 || CURL_BUILD_IOS_7
if(SSLSetSessionOption != NULL)
return TRUE;

View File

@ -261,7 +261,8 @@ out:
return loaded_file;
}
static void unload_file(gnutls_datum_t data) {
static void unload_file(gnutls_datum_t data)
{
free(data.data);
}

View File

@ -2181,7 +2181,8 @@ bool Curl_nss_cert_status_request(void)
#endif
}
bool Curl_nss_false_start(void) {
bool Curl_nss_false_start(void)
{
#if NSSVERNUM >= 0x030f04 /* 3.15.4 */
return TRUE;
#else

View File

@ -182,12 +182,13 @@ static bool ssl_prefs_check(struct Curl_easy *data)
}
static CURLcode
ssl_connect_init_proxy(struct connectdata *conn, int sockindex) {
ssl_connect_init_proxy(struct connectdata *conn, int sockindex)
{
DEBUGASSERT(conn->bits.proxy_ssl_connected[sockindex]);
if(ssl_connection_complete == conn->ssl[sockindex].state &&
!conn->proxy_ssl[sockindex].use) {
#if defined(USE_OPENSSL) || defined(USE_GNUTLS) || defined(USE_NSS) || \
defined(USE_GSKIT)
#if defined(USE_OPENSSL) || defined(USE_GNUTLS) || defined(USE_NSS) || \
defined(USE_GSKIT)
conn->proxy_ssl[sockindex] = conn->ssl[sockindex];
memset(&conn->ssl[sockindex], 0, sizeof(conn->ssl[sockindex]));
#else

View File

@ -50,7 +50,8 @@ static const char *RTP_DATA = "$_1234\n\0asdf";
static int rtp_packet_count = 0;
static size_t rtp_write(void *ptr, size_t size, size_t nmemb, void *stream) {
static size_t rtp_write(void *ptr, size_t size, size_t nmemb, void *stream)
{
char *data = (char *)ptr;
int channel = RTP_PKT_CHANNEL(data);
int message_size;

View File

@ -69,12 +69,12 @@ struct timetest {
};
UNITTEST_START
{
struct timeval now;
long timeout;
unsigned int i;
struct timeval now;
long timeout;
unsigned int i;
const struct timetest run[] = {
const struct timetest run[] = {
/* both timeouts set, not connecting */
{BASE + 4, 0, 10000, 8000, FALSE, 6000, "6 seconds should be left"},
{BASE + 4, 990000, 10000, 8000, FALSE, 5010, "5010 ms should be left"},
@ -126,21 +126,20 @@ const struct timetest run[] = {
/* both timeouts set, connecting, connect timeout the longer one */
{BASE + 4, 0, 10000, 12000, TRUE, 6000, "6 seconds should be left"},
};
};
/* this is the pretended start time of the transfer */
data->progress.t_startsingle.tv_sec = BASE;
data->progress.t_startsingle.tv_usec = 0;
data->progress.t_startop.tv_sec = BASE;
data->progress.t_startop.tv_usec = 0;
/* this is the pretended start time of the transfer */
data->progress.t_startsingle.tv_sec = BASE;
data->progress.t_startsingle.tv_usec = 0;
data->progress.t_startop.tv_sec = BASE;
data->progress.t_startop.tv_usec = 0;
for(i=0; i < sizeof(run)/sizeof(run[0]); i++) {
NOW(run[i].now_s, run[i].now_us);
TIMEOUTS(run[i].timeout_ms, run[i].connecttimeout_ms);
timeout = Curl_timeleft(data, &now, run[i].connecting);
if(timeout != run[i].result)
fail(run[i].comment);
for(i=0; i < sizeof(run)/sizeof(run[0]); i++) {
NOW(run[i].now_s, run[i].now_us);
TIMEOUTS(run[i].timeout_ms, run[i].connecttimeout_ms);
timeout = Curl_timeleft(data, &now, run[i].connecting);
if(timeout != run[i].result)
fail(run[i].comment);
}
}
UNITTEST_STOP

View File

@ -42,7 +42,8 @@ static void unit_stop(void)
#if defined(MSDOS) || defined(WIN32)
static char *getflagstr(int flags) {
static char *getflagstr(int flags)
{
char *buf = malloc(256);
fail_unless(buf, "out of memory");
snprintf(buf, 256, "%s,%s,%s,%s",
@ -53,7 +54,8 @@ static char *getflagstr(int flags) {
return buf;
}
static char *getcurlcodestr(int cc) {
static char *getcurlcodestr(int cc)
{
char *buf = malloc(256);
fail_unless(buf, "out of memory");
snprintf(buf, 256, "%s (%d)",