From 87501e57f1c166cb250111af54e0470ab8b2099c Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Tue, 12 Sep 2017 09:29:01 +0200 Subject: [PATCH] code style: remove wrong uses of multiple spaces Closes #1878 --- include/curl/curl.h | 4 ++-- lib/ftp.c | 2 +- lib/hostip.c | 2 +- lib/http.c | 4 ++-- lib/mprintf.c | 2 +- lib/splay.h | 4 ++-- lib/transfer.c | 2 +- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/include/curl/curl.h b/include/curl/curl.h index 6803a2e3c..1eb82f5c6 100644 --- a/include/curl/curl.h +++ b/include/curl/curl.h @@ -356,7 +356,7 @@ typedef size_t (*curl_read_callback)(char *buffer, size_t nitems, void *instream); -typedef enum { +typedef enum { CURLSOCKTYPE_IPCXN, /* socket created for a specific IP connection */ CURLSOCKTYPE_ACCEPT, /* socket created by accept() call */ CURLSOCKTYPE_LAST /* never use */ @@ -398,7 +398,7 @@ typedef enum { CURLIOE_LAST /* never use */ } curlioerr; -typedef enum { +typedef enum { CURLIOCMD_NOP, /* no operation */ CURLIOCMD_RESTARTREAD, /* restart the read stream from start */ CURLIOCMD_LAST /* never use */ diff --git a/lib/ftp.c b/lib/ftp.c index 1452d47c4..4860509f3 100644 --- a/lib/ftp.c +++ b/lib/ftp.c @@ -1469,7 +1469,7 @@ static CURLcode ftp_state_list(struct connectdata *conn) return CURLE_OUT_OF_MEMORY; /* Check if path does not end with /, as then we cut off the file part */ - if(lstArg[strlen(lstArg) - 1] != '/') { + if(lstArg[strlen(lstArg) - 1] != '/') { /* chop off the file part if format is dir/dir/file */ slashPos = strrchr(lstArg, '/'); diff --git a/lib/hostip.c b/lib/hostip.c index 33b49895c..1a18a3ed7 100644 --- a/lib/hostip.c +++ b/lib/hostip.c @@ -306,7 +306,7 @@ fetch_addr(struct connectdata *conn, /* See if its already in our dns cache */ dns = Curl_hash_pick(data->dns.hostcache, entry_id, entry_len + 1); - if(dns && (data->set.dns_cache_timeout != -1)) { + if(dns && (data->set.dns_cache_timeout != -1)) { /* See whether the returned entry is stale. Done before we release lock */ struct hostcache_prune_data user; diff --git a/lib/http.c b/lib/http.c index 8dfea7b70..ea3e8af35 100644 --- a/lib/http.c +++ b/lib/http.c @@ -2079,7 +2079,7 @@ CURLcode Curl_http(struct connectdata *conn, bool *done) } #ifndef CURL_DISABLE_PROXY - if(conn->bits.httpproxy && !conn->bits.tunnel_proxy) { + if(conn->bits.httpproxy && !conn->bits.tunnel_proxy) { /* Using a proxy but does not tunnel through it */ /* The path sent to the proxy is in fact the entire URL. But if the remote @@ -2624,7 +2624,7 @@ CURLcode Curl_http(struct connectdata *conn, bool *done) its size. */ if(conn->httpversion != 20 && !data->state.expect100header && - (postsize < MAX_INITIAL_POST_SIZE)) { + (postsize < MAX_INITIAL_POST_SIZE)) { /* if we don't use expect: 100 AND postsize is less than MAX_INITIAL_POST_SIZE diff --git a/lib/mprintf.c b/lib/mprintf.c index 9a9eb16e6..d2d91d743 100644 --- a/lib/mprintf.c +++ b/lib/mprintf.c @@ -107,7 +107,7 @@ static const char upper_digits[] = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ"; } WHILE_FALSE /* Data type to read from the arglist */ -typedef enum { +typedef enum { FORMAT_UNKNOWN = 0, FORMAT_STRING, FORMAT_PTR, diff --git a/lib/splay.h b/lib/splay.h index 0273bad38..4612ec271 100644 --- a/lib/splay.h +++ b/lib/splay.h @@ -54,8 +54,8 @@ int Curl_splayremovebyaddr(struct Curl_tree *t, struct Curl_tree *removenode, struct Curl_tree **newroot); -#define Curl_splaycomparekeys(i,j) ( ((i.tv_sec) < (j.tv_sec)) ? -1 : \ - ( ((i.tv_sec) > (j.tv_sec)) ? 1 : \ +#define Curl_splaycomparekeys(i,j) ( ((i.tv_sec) < (j.tv_sec)) ? -1 : \ + ( ((i.tv_sec) > (j.tv_sec)) ? 1 : \ ( ((i.tv_usec) < (j.tv_usec)) ? -1 : \ ( ((i.tv_usec) > (j.tv_usec)) ? 1 : 0)))) diff --git a/lib/transfer.c b/lib/transfer.c index 87366fa8c..792d5aff8 100644 --- a/lib/transfer.c +++ b/lib/transfer.c @@ -1774,7 +1774,7 @@ CURLcode Curl_follow(struct Curl_easy *data, } } - if(!is_absolute_url(newurl)) { + if(!is_absolute_url(newurl)) { /*** *DANG* this is an RFC 2068 violation. The URL is supposed to be absolute and this doesn't seem to be that!