romenskiy2012/curl
1
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2026-07-31 01:58:13 +03:00
Code Issues Projects Releases Packages Wiki Activity

lib/src: white space edits to comply better with code style

Browse source 
... as checksrc now finds and complains about these.

Closes #14921
This commit is contained in:
Daniel Stenberg 2024-09-18 15:29:51 +02:00
parent a57b45c386
commit fbf5d507ce
No known key found for this signature in database
GPG key ID: 5CC908FDB71E12C2
128 changed files with 854 additions and 837 deletions
Download patch file Download diff file Expand all files Collapse all files

14
tests/http/clients/h2-pausing.c
View file

@ -273,7 +273,7 @@ int main(int argc, char *argv[])
host, port);
resolve = curl_slist_append(resolve, resolve_buf);
for(i = 0; i<HANDLECOUNT; i++) {
for(i = 0; i < HANDLECOUNT; i++) {
handles[i].idx = i;
handles[i].paused = 0;
handles[i].resumed = 0;
@ -301,7 +301,7 @@ int main(int argc, char *argv[])
if(!multi_handle)
err();
for(i = 0; i<HANDLECOUNT; i++) {
for(i = 0; i < HANDLECOUNT; i++) {
if(curl_multi_add_handle(multi_handle, handles[i].h) != CURLM_OK)
err();
}
@ -314,7 +314,7 @@ int main(int argc, char *argv[])
if(!still_running) {
int as_expected = 1;
fprintf(stderr, "INFO: no more handles running\n");
for(i = 0; i<HANDLECOUNT; i++) {
for(i = 0; i < HANDLECOUNT; i++) {
if(!handles[i].paused) {
fprintf(stderr, "ERROR: [%d] NOT PAUSED\n", i);
as_expected = 0;
@ -348,7 +348,7 @@ int main(int argc, char *argv[])
/* !checksrc! disable EQUALSNULL 1 */
while((msg = curl_multi_info_read(multi_handle, &msgs_left)) != NULL) {
if(msg->msg == CURLMSG_DONE) {
for(i = 0; i<HANDLECOUNT; i++) {
for(i = 0; i < HANDLECOUNT; i++) {
if(msg->easy_handle == handles[i].h) {
if(handles[i].paused != 1 || !handles[i].resumed) {
fprintf(stderr, "ERROR: [%d] done, pauses=%d, resumed=%d, "
@ -364,7 +364,7 @@ int main(int argc, char *argv[])
/* Successfully paused? */
if(!all_paused) {
for(i = 0; i<HANDLECOUNT; i++) {
for(i = 0; i < HANDLECOUNT; i++) {
if(!handles[i].paused) {
break;
}
@ -378,7 +378,7 @@ int main(int argc, char *argv[])
}
if(resume_round > 0 && rounds == resume_round) {
/* time to resume */
for(i = 0; i<HANDLECOUNT; i++) {
for(i = 0; i < HANDLECOUNT; i++) {
fprintf(stderr, "INFO: [%d] resumed\n", i);
handles[i].resumed = 1;
curl_easy_pause(handles[i].h, CURLPAUSE_CONT);
@ -387,7 +387,7 @@ int main(int argc, char *argv[])
}
out:
for(i = 0; i<HANDLECOUNT; i++) {
for(i = 0; i < HANDLECOUNT; i++) {
curl_multi_remove_handle(multi_handle, handles[i].h);
curl_easy_cleanup(handles[i].h);
}

6
tests/http/clients/h2-serverpush.c
View file

@ -52,7 +52,7 @@ void dump(const char *text, unsigned char *ptr, size_t size,
fprintf(stderr, "%s, %lu bytes (0x%lx)\n",
text, (unsigned long)size, (unsigned long)size);
for(i = 0; i<size; i += width) {
for(i = 0; i < size; i += width) {
fprintf(stderr, "%4.4lx: ", (unsigned long)i);
@ -73,7 +73,7 @@ void dump(const char *text, unsigned char *ptr, size_t size,
break;
}
fprintf(stderr, "%c",
(ptr[i + c] >= 0x20) && (ptr[i + c]<0x80)?ptr[i + c]:'.');
(ptr[i + c] >= 0x20) && (ptr[i + c] < 0x80) ? ptr[i + c] : '.');
/* check again for 0D0A, to avoid an extra \n if it's at width */
if(nohex && (i + c + 2 < size) && ptr[i + c + 1] == 0x0D &&
ptr[i + c + 2] == 0x0A) {
@ -183,7 +183,7 @@ static int server_push_callback(CURL *parent,
fprintf(stderr, "**** push callback approves stream %u, got %lu headers!\n",
count, (unsigned long)num_headers);
for(i = 0; i<num_headers; i++) {
for(i = 0; i < num_headers; i++) {
headp = curl_pushheader_bynum(headers, i);
fprintf(stderr, "**** header %lu: %s\n", (unsigned long)i, headp);
}

2
tests/http/clients/hx-download.c
View file

@ -367,7 +367,7 @@ int main(int argc, char *argv[])
t->pause_at = (curl_off_t)pause_offset;
}
n = (max_parallel < transfer_count)? max_parallel : transfer_count;
n = (max_parallel < transfer_count) ? max_parallel : transfer_count;
for(i = 0; i < n; ++i) {
t = &transfers[i];
t->easy = curl_easy_init();

2
tests/http/clients/hx-upload.c
View file

@ -446,7 +446,7 @@ int main(int argc, char *argv[])
multi_handle = curl_multi_init();
curl_multi_setopt(multi_handle, CURLMOPT_PIPELINING, CURLPIPE_MULTIPLEX);
n = (max_parallel < transfer_count)? max_parallel : transfer_count;
n = (max_parallel < transfer_count) ? max_parallel : transfer_count;
for(i = 0; i < n; ++i) {
t = &transfers[i];
t->easy = curl_easy_init();

4
tests/http/clients/ws-data.c
View file

@ -60,7 +60,7 @@ void dump(const char *text, unsigned char *ptr, size_t size,
fprintf(stderr, "%s, %lu bytes (0x%lx)\n",
text, (unsigned long)size, (unsigned long)size);
for(i = 0; i<size; i += width) {
for(i = 0; i < size; i += width) {
fprintf(stderr, "%4.4lx: ", (unsigned long)i);
@ -81,7 +81,7 @@ void dump(const char *text, unsigned char *ptr, size_t size,
break;
}
fprintf(stderr, "%c",
(ptr[i + c] >= 0x20) && (ptr[i + c]<0x80)?ptr[i + c]:'.');
(ptr[i + c] >= 0x20) && (ptr[i + c] < 0x80) ? ptr[i + c] : '.');
/* check again for 0D0A, to avoid an extra \n if it's at width */
if(nohex && (i + c + 2 < size) && ptr[i + c + 1] == 0x0D &&
ptr[i + c + 2] == 0x0A) {

2
tests/http/testenv/mod_curltest/mod_curltest.c
View file

@ -439,7 +439,7 @@ static int curltest_tweak_handler(request_rec *r)
ap_log_rerror(APLOG_MARK, APLOG_TRACE1, 0, r, "error_handler: processing "
"request, %s", r->args? r->args : "(no args)");
r->status = http_status;
r->clength = with_cl? (chunks * chunk_size) : -1;
r->clength = with_cl ? (chunks * chunk_size) : -1;
r->chunked = (r->proto_num >= HTTP_VERSION(1, 1)) && !with_cl;
apr_table_setn(r->headers_out, "request-id", request_id);
if(r->clength >= 0) {

8
tests/libtest/first.c
View file

@ -127,7 +127,7 @@ char *hexdump(const unsigned char *buffer, size_t len)
size_t i;
if(len > 200)
return NULL;
for(i = 0; i<len; i++, p += 3)
for(i = 0; i < len; i++, p += 3)
msnprintf(p, 4, "%02x ", buffer[i]);
return dump;
}
@ -157,7 +157,7 @@ int main(int argc, char **argv)
setlocale(LC_ALL, "");
#endif
if(argc< 2) {
if(argc < 2) {
fprintf(stderr, "Pass URL as argument please\n");
return 1;
}
@ -165,10 +165,10 @@ int main(int argc, char **argv)
test_argc = argc;
test_argv = argv;
if(argc>2)
if(argc > 2)
libtest_arg2 = argv[2];
if(argc>3)
if(argc > 3)
libtest_arg3 = argv[3];
URL = argv[1]; /* provide this to the rest */

24
tests/libtest/lib1156.c
View file

@ -90,35 +90,35 @@ static int onetest(CURL *curl, const char *url, const struct testparams *p,
unsigned int replyselector;
char urlbuf[256];
replyselector = (p->flags & F_CONTENTRANGE)? 1: 0;
replyselector = (p->flags & F_CONTENTRANGE) ? 1: 0;
if(p->flags & F_HTTP416)
replyselector += 2;
msnprintf(urlbuf, sizeof(urlbuf), "%s%04u", url, replyselector);
test_setopt(curl, CURLOPT_URL, urlbuf);
test_setopt(curl, CURLOPT_VERBOSE, 1L);
test_setopt(curl, CURLOPT_RESUME_FROM, (p->flags & F_RESUME)? 3: 0);
test_setopt(curl, CURLOPT_RANGE, !(p->flags & F_RESUME)?
test_setopt(curl, CURLOPT_RESUME_FROM, (p->flags & F_RESUME) ? 3: 0);
test_setopt(curl, CURLOPT_RANGE, !(p->flags & F_RESUME) ?
"3-1000000": (char *) NULL);
test_setopt(curl, CURLOPT_FAILONERROR, (p->flags & F_FAIL)? 1: 0);
test_setopt(curl, CURLOPT_FAILONERROR, (p->flags & F_FAIL) ? 1: 0);
hasbody = 0;
res = curl_easy_perform(curl);
if(res != p->result) {
printf("%zd: bad error code (%d): resume=%s, fail=%s, http416=%s, "
"content-range=%s, expected=%d\n", num, res,
(p->flags & F_RESUME)? "yes": "no",
(p->flags & F_FAIL)? "yes": "no",
(p->flags & F_HTTP416)? "yes": "no",
(p->flags & F_CONTENTRANGE)? "yes": "no",
(p->flags & F_RESUME) ? "yes": "no",
(p->flags & F_FAIL) ? "yes": "no",
(p->flags & F_HTTP416) ? "yes": "no",
(p->flags & F_CONTENTRANGE) ? "yes": "no",
p->result);
return 1;
}
if(hasbody && (p->flags & F_IGNOREBODY)) {
printf("body should be ignored and is not: resume=%s, fail=%s, "
"http416=%s, content-range=%s\n",
(p->flags & F_RESUME)? "yes": "no",
(p->flags & F_FAIL)? "yes": "no",
(p->flags & F_HTTP416)? "yes": "no",
(p->flags & F_CONTENTRANGE)? "yes": "no");
(p->flags & F_RESUME) ? "yes": "no",
(p->flags & F_FAIL) ? "yes": "no",
(p->flags & F_HTTP416) ? "yes": "no",
(p->flags & F_CONTENTRANGE) ? "yes": "no");
return 1;
}
return 0;

14
tests/libtest/lib1560.c
View file

@ -1769,13 +1769,13 @@ static int huge(void)
char *partp;
msnprintf(total, sizeof(total),
"%s://%s:%s@%s/%s?%s#%s",
(i == 0)? &bigpart[1] : smallpart,
(i == 1)? &bigpart[1] : smallpart,
(i == 2)? &bigpart[1] : smallpart,
(i == 3)? &bigpart[1] : smallpart,
(i == 4)? &bigpart[1] : smallpart,
(i == 5)? &bigpart[1] : smallpart,
(i == 6)? &bigpart[1] : smallpart);
(i == 0) ? &bigpart[1] : smallpart,
(i == 1) ? &bigpart[1] : smallpart,
(i == 2) ? &bigpart[1] : smallpart,
(i == 3) ? &bigpart[1] : smallpart,
(i == 4) ? &bigpart[1] : smallpart,
(i == 5) ? &bigpart[1] : smallpart,
(i == 6) ? &bigpart[1] : smallpart);
rc = curl_url_set(urlp, CURLUPART_URL, total, CURLU_NON_SUPPORT_SCHEME);
if((!i && (rc != CURLUE_BAD_SCHEME)) ||
(i && rc)) {

2
tests/libtest/lib2302.c
View file

@ -63,7 +63,7 @@ static size_t add_data(struct ws_data *wd, const char *buf, size_t blen,
if(wd->nwrites > 0)
flush_data(wd);
wd->has_meta = (meta != NULL);
wd->meta_flags = meta? meta->flags : 0;
wd->meta_flags = meta ? meta->flags : 0;
}
if(wd->blen + blen > sizeof(wd->buf)) {

4
tests/libtest/lib552.c
View file

@ -50,7 +50,7 @@ void dump(const char *text,
fprintf(stream, "%s, %zu bytes (0x%zx)\n", text, size, size);
for(i = 0; i<size; i += width) {
for(i = 0; i < size; i += width) {
fprintf(stream, "%04zx: ", i);
@ -71,7 +71,7 @@ void dump(const char *text,
break;
}
fprintf(stream, "%c",
(ptr[i + c] >= 0x20) && (ptr[i + c]<0x80)? ptr[i + c] : '.');
(ptr[i + c] >= 0x20) && (ptr[i + c] < 0x80) ? ptr[i + c] : '.');
/* check again for 0D0A, to avoid an extra \n if it's at width */
if(nohex && (i + c + 2 < size) && ptr[i + c + 1] == 0x0D &&
ptr[i + c + 2] == 0x0A) {

18
tests/libtest/lib557.c
View file

@ -150,7 +150,7 @@ static int test_unsigned_short_formatting(void)
for(i = 1; i <= num_ushort_tests; i++) {
for(j = 0; j<BUFSZ; j++)
for(j = 0; j < BUFSZ; j++)
us_test[i].result[j] = 'X';
us_test[i].result[BUFSZ-1] = '\0';
@ -224,7 +224,7 @@ static int test_signed_short_formatting(void)
for(i = 1; i <= num_sshort_tests; i++) {
for(j = 0; j<BUFSZ; j++)
for(j = 0; j < BUFSZ; j++)
ss_test[i].result[j] = 'X';
ss_test[i].result[BUFSZ-1] = '\0';
@ -374,7 +374,7 @@ static int test_unsigned_int_formatting(void)
for(i = 1; i <= num_uint_tests; i++) {
for(j = 0; j<BUFSZ; j++)
for(j = 0; j < BUFSZ; j++)
ui_test[i].result[j] = 'X';
ui_test[i].result[BUFSZ-1] = '\0';
@ -602,7 +602,7 @@ static int test_signed_int_formatting(void)
for(i = 1; i <= num_sint_tests; i++) {
for(j = 0; j<BUFSZ; j++)
for(j = 0; j < BUFSZ; j++)
si_test[i].result[j] = 'X';
si_test[i].result[BUFSZ-1] = '\0';
@ -751,7 +751,7 @@ static int test_unsigned_long_formatting(void)
for(i = 1; i <= num_ulong_tests; i++) {
for(j = 0; j<BUFSZ; j++)
for(j = 0; j < BUFSZ; j++)
ul_test[i].result[j] = 'X';
ul_test[i].result[BUFSZ-1] = '\0';
@ -979,7 +979,7 @@ static int test_signed_long_formatting(void)
for(i = 1; i <= num_slong_tests; i++) {
for(j = 0; j<BUFSZ; j++)
for(j = 0; j < BUFSZ; j++)
sl_test[i].result[j] = 'X';
sl_test[i].result[BUFSZ-1] = '\0';
@ -1093,7 +1093,7 @@ static int test_curl_off_t_formatting(void)
for(i = 1; i <= num_cofft_tests; i++) {
for(j = 0; j<BUFSZ; j++)
for(j = 0; j < BUFSZ; j++)
co_test[i].result[j] = 'X';
co_test[i].result[BUFSZ-1] = '\0';
@ -1389,7 +1389,7 @@ static int test_float_formatting(void)
/* very large precisions easily turn into system specific outputs so we only
check the output buffer length here as we know the internal limit */
curl_msnprintf(buf, sizeof(buf), "%.*f", (1<<30), 9.2987654);
curl_msnprintf(buf, sizeof(buf), "%.*f", (1 << 30), 9.2987654);
errors += strlen_check(buf, 325);
curl_msnprintf(buf, sizeof(buf), "%10000.10000f", 9.2987654);
@ -1406,7 +1406,7 @@ static int test_float_formatting(void)
/* curl_msnprintf() limits a single float output to 325 bytes maximum
width */
curl_msnprintf(buf, sizeof(buf), "%*f", (1<<30), 9.1);
curl_msnprintf(buf, sizeof(buf), "%*f", (1 << 30), 9.1);
errors += string_check(buf, " 9.100000");
curl_msnprintf(buf, sizeof(buf), "%100000f", 9.1);
errors += string_check(buf, " 9.100000");

2
tests/libtest/lib670.c
View file

@ -61,7 +61,7 @@ static size_t read_callback(char *ptr, size_t size, size_t nmemb, void *userp)
return CURL_READFUNC_PAUSE;
case 2:
delta = time(NULL) - pooh->origin;
*ptr = delta >= PAUSE_TIME? '\x42': '\x41'; /* ASCII A or B. */
*ptr = delta >= PAUSE_TIME ? '\x42': '\x41'; /* ASCII A or B. */
return 1;
case 3:
return 0;

23
tests/server/mqttd.c
View file

@ -192,7 +192,7 @@ static void loghex(unsigned char *buffer, ssize_t len)
ssize_t width = 0;
int left = sizeof(data);
for(i = 0; i<len && (left >= 0); i++) {
for(i = 0; i < len && (left >= 0); i++) {
msnprintf(optr, left, "%02x", ptr[i]);
width += 2;
optr += 2;
@ -218,15 +218,14 @@ static void logprotocol(mqttdir dir,
char *optr = data;
int left = sizeof(data);
for(i = 0; i<len && (left >= 0); i++) {
for(i = 0; i < len && (left >= 0); i++) {
msnprintf(optr, left, "%02x", ptr[i]);
optr += 2;
left -= 2;
}
fprintf(output, "%s %s %zx %s\n",
dir == FROM_CLIENT? "client": "server",
prefix, remlen,
data);
dir == FROM_CLIENT ? "client" : "server",
prefix, remlen, data);
}
@ -931,7 +930,7 @@ int main(int argc, char *argv[])
int error;
int arg = 1;
while(argc>arg) {
while(argc > arg) {
if(!strcmp("--version", argv[arg])) {
printf("mqttd IPv4%s\n",
#ifdef USE_IPV6
@ -944,27 +943,27 @@ int main(int argc, char *argv[])
}
else if(!strcmp("--pidfile", argv[arg])) {
arg++;
if(argc>arg)
if(argc > arg)
pidname = argv[arg++];
}
else if(!strcmp("--portfile", argv[arg])) {
arg++;
if(argc>arg)
if(argc > arg)
portname = argv[arg++];
}
else if(!strcmp("--config", argv[arg])) {
arg++;
if(argc>arg)
if(argc > arg)
configfile = argv[arg++];
}
else if(!strcmp("--logfile", argv[arg])) {
arg++;
if(argc>arg)
if(argc > arg)
serverlogfile = argv[arg++];
}
else if(!strcmp("--logdir", argv[arg])) {
arg++;
if(argc>arg)
if(argc > arg)
logdir = argv[arg++];
}
else if(!strcmp("--ipv6", argv[arg])) {
@ -984,7 +983,7 @@ int main(int argc, char *argv[])
}
else if(!strcmp("--port", argv[arg])) {
arg++;
if(argc>arg) {
if(argc > arg) {
char *endptr;
unsigned long ulnum = strtoul(argv[arg], &endptr, 10);
if((endptr != argv[arg] + strlen(argv[arg])) ||

2
tests/server/resolve.c
View file

@ -62,7 +62,7 @@ int main(int argc, char *argv[])
const char *host = NULL;
int rc = 0;
while(argc>arg) {
while(argc > arg) {
if(!strcmp("--version", argv[arg])) {
printf("resolve IPv4%s\n",
#if defined(CURLRES_IPV6)

16
tests/server/rtspd.c
View file

@ -953,7 +953,7 @@ static int send_doc(curl_socket_t sock, struct httprequest *req)
count -= written;
buffer += written;
} while(count>0);
} while(count > 0);
/* Send out any RTP data */
if(req->rtp_buffer) {
@ -1066,7 +1066,7 @@ int main(int argc, char *argv[])
memset(&req, 0, sizeof(req));
while(argc>arg) {
while(argc > arg) {
if(!strcmp("--version", argv[arg])) {
printf("rtspd IPv4%s"
"\n"
@ -1081,22 +1081,22 @@ int main(int argc, char *argv[])
}
else if(!strcmp("--pidfile", argv[arg])) {
arg++;
if(argc>arg)
if(argc > arg)
pidname = argv[arg++];
}
else if(!strcmp("--portfile", argv[arg])) {
arg++;
if(argc>arg)
if(argc > arg)
portname = argv[arg++];
}
else if(!strcmp("--logfile", argv[arg])) {
arg++;
if(argc>arg)
if(argc > arg)
serverlogfile = argv[arg++];
}
else if(!strcmp("--logdir", argv[arg])) {
arg++;
if(argc>arg)
if(argc > arg)
logdir = argv[arg++];
}
else if(!strcmp("--ipv4", argv[arg])) {
@ -1115,7 +1115,7 @@ int main(int argc, char *argv[])
}
else if(!strcmp("--port", argv[arg])) {
arg++;
if(argc>arg) {
if(argc > arg) {
char *endptr;
unsigned long ulnum = strtoul(argv[arg], &endptr, 10);
port = curlx_ultous(ulnum);
@ -1124,7 +1124,7 @@ int main(int argc, char *argv[])
}
else if(!strcmp("--srcdir", argv[arg])) {
arg++;
if(argc>arg) {
if(argc > arg) {
path = argv[arg];
arg++;
}

18
tests/server/sockfilt.c
View file

@ -362,7 +362,7 @@ static void lograw(unsigned char *buffer, ssize_t len)
ssize_t width = 0;
int left = sizeof(data);
for(i = 0; i<len; i++) {
for(i = 0; i < len; i++) {
switch(ptr[i]) {
case '\n':
msnprintf(optr, left, "\\n");
@ -378,14 +378,14 @@ static void lograw(unsigned char *buffer, ssize_t len)
break;
default:
msnprintf(optr, left, "%c", (ISGRAPH(ptr[i]) ||
ptr[i] == 0x20) ?ptr[i]:'.');
ptr[i] == 0x20) ? ptr[i] : '.');
width++;
optr++;
left--;
break;
}
if(width>60) {
if(width > 60) {
logmsg("'%s'", data);
width = 0;
optr = data;
@ -1366,7 +1366,7 @@ int main(int argc, char *argv[])
enum sockmode mode = PASSIVE_LISTEN; /* default */
const char *addr = NULL;
while(argc>arg) {
while(argc > arg) {
if(!strcmp("--version", argv[arg])) {
printf("sockfilt IPv4%s\n",
#ifdef USE_IPV6
@ -1383,7 +1383,7 @@ int main(int argc, char *argv[])
}
else if(!strcmp("--pidfile", argv[arg])) {
arg++;
if(argc>arg)
if(argc > arg)
pidname = argv[arg++];
}
else if(!strcmp("--portfile", argv[arg])) {
@ -1393,7 +1393,7 @@ int main(int argc, char *argv[])
}
else if(!strcmp("--logfile", argv[arg])) {
arg++;
if(argc>arg)
if(argc > arg)
serverlogfile = argv[arg++];
}
else if(!strcmp("--ipv6", argv[arg])) {
@ -1417,7 +1417,7 @@ int main(int argc, char *argv[])
}
else if(!strcmp("--port", argv[arg])) {
arg++;
if(argc>arg) {
if(argc > arg) {
char *endptr;
unsigned long ulnum = strtoul(argv[arg], &endptr, 10);
port = curlx_ultous(ulnum);
@ -1428,7 +1428,7 @@ int main(int argc, char *argv[])
/* Asked to actively connect to the specified local port instead of
doing a passive server-style listening. */
arg++;
if(argc>arg) {
if(argc > arg) {
char *endptr;
unsigned long ulnum = strtoul(argv[arg], &endptr, 10);
if((endptr != argv[arg] + strlen(argv[arg])) ||
@ -1444,7 +1444,7 @@ int main(int argc, char *argv[])
else if(!strcmp("--addr", argv[arg])) {
/* Set an IP address to use with --connect; otherwise use localhost */
arg++;
if(argc>arg) {
if(argc > arg) {
addr = argv[arg];
arg++;
}

26
tests/server/socksd.c
View file

@ -248,7 +248,7 @@ static void loghex(unsigned char *buffer, ssize_t len)
ssize_t width = 0;
int left = sizeof(data);
for(i = 0; i<len && (left >= 0); i++) {
for(i = 0; i < len && (left >= 0); i++) {
msnprintf(optr, left, "%02x", ptr[i]);
width += 2;
optr += 2;
@ -324,7 +324,7 @@ static curl_socket_t socks4(curl_socket_t fd,
return CURL_SOCKET_BAD;
}
if(!config.port)
s4port = (unsigned short)((buffer[SOCKS4_DSTPORT]<<8) |
s4port = (unsigned short)((buffer[SOCKS4_DSTPORT] << 8) |
(buffer[SOCKS4_DSTPORT + 1]));
else
s4port = config.port;
@ -572,7 +572,7 @@ static curl_socket_t sockit(curl_socket_t fd)
if(!config.port) {
unsigned char *portp = &buffer[SOCKS5_DSTADDR + len];
s5port = (unsigned short)((portp[0]<<8) | (portp[1]));
s5port = (unsigned short)((portp[0] << 8) | (portp[1]));
}
else
s5port = config.port;
@ -968,7 +968,7 @@ int main(int argc, char *argv[])
bool unlink_socket = false;
#endif
while(argc>arg) {
while(argc > arg) {
if(!strcmp("--version", argv[arg])) {
printf("socksd IPv4%s\n",
#ifdef USE_IPV6
@ -981,37 +981,37 @@ int main(int argc, char *argv[])
}
else if(!strcmp("--pidfile", argv[arg])) {
arg++;
if(argc>arg)
if(argc > arg)
pidname = argv[arg++];
}
else if(!strcmp("--portfile", argv[arg])) {
arg++;
if(argc>arg)
if(argc > arg)
portname = argv[arg++];
}
else if(!strcmp("--config", argv[arg])) {
arg++;
if(argc>arg)
if(argc > arg)
configfile = argv[arg++];
}
else if(!strcmp("--backend", argv[arg])) {
arg++;
if(argc>arg)
if(argc > arg)
backendaddr = argv[arg++];
}
else if(!strcmp("--backendport", argv[arg])) {
arg++;
if(argc>arg)
if(argc > arg)
backendport = (unsigned short)atoi(argv[arg++]);
}
else if(!strcmp("--logfile", argv[arg])) {
arg++;
if(argc>arg)
if(argc > arg)
serverlogfile = argv[arg++];
}
else if(!strcmp("--reqfile", argv[arg])) {
arg++;
if(argc>arg)
if(argc > arg)
reqlogfile = argv[arg++];
}
else if(!strcmp("--ipv6", argv[arg])) {
@ -1030,7 +1030,7 @@ int main(int argc, char *argv[])
}
else if(!strcmp("--unix-socket", argv[arg])) {
arg++;
if(argc>arg) {
if(argc > arg) {
#ifdef USE_UNIX_SOCKETS
struct sockaddr_un sau;
unix_socket = argv[arg];
@ -1048,7 +1048,7 @@ int main(int argc, char *argv[])
}
else if(!strcmp("--port", argv[arg])) {
arg++;
if(argc>arg) {
if(argc > arg) {
char *endptr;
unsigned long ulnum = strtoul(argv[arg], &endptr, 10);
port = curlx_ultous(ulnum);

30
tests/server/sws.c
View file

@ -372,7 +372,7 @@ static int ProcessRequest(struct httprequest *req)
req->callcount++;
logmsg("Process %zu bytes request%s", req->offset,
req->callcount > 1?" [CONTINUED]":"");
req->callcount > 1 ? " [CONTINUED]" : "");
/* try to figure out the request characteristics as soon as possible, but
only once! */
@ -792,7 +792,7 @@ static void storerequest(const char *reqbuf, size_t totalsize)
char dumpfile[256];
msnprintf(dumpfile, sizeof(dumpfile), "%s/%s",
logdir, is_proxy?REQUEST_PROXY_DUMP:REQUEST_DUMP);
logdir, is_proxy ? REQUEST_PROXY_DUMP : REQUEST_DUMP);
if(!reqbuf)
return;
@ -1021,7 +1021,7 @@ static int send_doc(curl_socket_t sock, struct httprequest *req)
char responsedump[256];
msnprintf(responsedump, sizeof(responsedump), "%s/%s",
logdir, is_proxy?RESPONSE_PROXY_DUMP:RESPONSE_DUMP);
logdir, is_proxy ? RESPONSE_PROXY_DUMP:RESPONSE_DUMP);
switch(req->rcmd) {
default:
@ -1084,7 +1084,7 @@ static int send_doc(curl_socket_t sock, struct httprequest *req)
/* select the <data> tag for "normal" requests and the <connect> one
for CONNECT requests (within the <reply> section) */
const char *section = req->connect_request?"connect":"data";
const char *section = req->connect_request ? "connect" : "data";
if(req->partno)
msnprintf(partbuf, sizeof(partbuf), "%s%ld", section, req->partno);
@ -2017,7 +2017,7 @@ int main(int argc, char *argv[])
/* a default CONNECT port is basically pointless but still ... */
size_t socket_idx;
while(argc>arg) {
while(argc > arg) {
if(!strcmp("--version", argv[arg])) {
puts("sws IPv4"
#ifdef USE_IPV6
@ -2031,27 +2031,27 @@ int main(int argc, char *argv[])
}
else if(!strcmp("--pidfile", argv[arg])) {
arg++;
if(argc>arg)
if(argc > arg)
pidname = argv[arg++];
}
else if(!strcmp("--portfile", argv[arg])) {
arg++;
if(argc>arg)
if(argc > arg)
portname = argv[arg++];
}
else if(!strcmp("--logfile", argv[arg])) {
arg++;
if(argc>arg)
if(argc > arg)
serverlogfile = argv[arg++];
}
else if(!strcmp("--logdir", argv[arg])) {
arg++;
if(argc>arg)
if(argc > arg)
logdir = argv[arg++];
}
else if(!strcmp("--cmdfile", argv[arg])) {
arg++;
if(argc>arg)
if(argc > arg)
cmdfile = argv[arg++];
}
else if(!strcmp("--gopher", argv[arg])) {
@ -2076,7 +2076,7 @@ int main(int argc, char *argv[])
}
else if(!strcmp("--unix-socket", argv[arg])) {
arg++;
if(argc>arg) {
if(argc > arg) {
#ifdef USE_UNIX_SOCKETS
unix_socket = argv[arg];
if(strlen(unix_socket) >= sizeof(me.sau.sun_path)) {
@ -2094,7 +2094,7 @@ int main(int argc, char *argv[])
}
else if(!strcmp("--port", argv[arg])) {
arg++;
if(argc>arg) {
if(argc > arg) {
char *endptr;
unsigned long ulnum = strtoul(argv[arg], &endptr, 10);
if((endptr != argv[arg] + strlen(argv[arg])) ||
@ -2109,14 +2109,14 @@ int main(int argc, char *argv[])
}
else if(!strcmp("--srcdir", argv[arg])) {
arg++;
if(argc>arg) {
if(argc > arg) {
path = argv[arg];
arg++;
}
}
else if(!strcmp("--keepalive", argv[arg])) {
arg++;
if(argc>arg) {
if(argc > arg) {
char *endptr;
unsigned long ulnum = strtoul(argv[arg], &endptr, 10);
if((endptr != argv[arg] + strlen(argv[arg])) ||
@ -2134,7 +2134,7 @@ int main(int argc, char *argv[])
what the client asks for, but also use this as a hint that we run as
a proxy and do a few different internal choices */
arg++;
if(argc>arg) {
if(argc > arg) {
connecthost = argv[arg];
arg++;
is_proxy = TRUE;

2
tests/server/testpart.c
View file

@ -35,7 +35,7 @@ int main(int argc, char **argv)
char *part;
size_t partlen;
if(argc< 3) {
if(argc < 3) {
printf("./testpart main sub\n");
}
else {

14
tests/server/tftpd.c
View file

@ -564,7 +564,7 @@ int main(int argc, char **argv)
memset(&test, 0, sizeof(test));
while(argc>arg) {
while(argc > arg) {
if(!strcmp("--version", argv[arg])) {
printf("tftpd IPv4%s\n",
#ifdef USE_IPV6
@ -577,22 +577,22 @@ int main(int argc, char **argv)
}
else if(!strcmp("--pidfile", argv[arg])) {
arg++;
if(argc>arg)
if(argc > arg)
pidname = argv[arg++];
}
else if(!strcmp("--portfile", argv[arg])) {
arg++;
if(argc>arg)
if(argc > arg)
portname = argv[arg++];
}
else if(!strcmp("--logfile", argv[arg])) {
arg++;
if(argc>arg)
if(argc > arg)
serverlogfile = argv[arg++];
}
else if(!strcmp("--logdir", argv[arg])) {
arg++;
if(argc>arg)
if(argc > arg)
logdir = argv[arg++];
}
else if(!strcmp("--ipv4", argv[arg])) {
@ -611,7 +611,7 @@ int main(int argc, char **argv)
}
else if(!strcmp("--port", argv[arg])) {
arg++;
if(argc>arg) {
if(argc > arg) {
char *endptr;
unsigned long ulnum = strtoul(argv[arg], &endptr, 10);
port = curlx_ultous(ulnum);
@ -620,7 +620,7 @@ int main(int argc, char **argv)
}
else if(!strcmp("--srcdir", argv[arg])) {
arg++;
if(argc>arg) {
if(argc > arg) {
path = argv[arg];
arg++;
}

25
tests/server/util.c
View file

@ -562,15 +562,22 @@ static BOOL WINAPI ctrl_event_handler(DWORD dwCtrlType)
logmsg("ctrl_event_handler: %lu", dwCtrlType);
switch(dwCtrlType) {
#ifdef SIGINT
case CTRL_C_EVENT: signum = SIGINT; break;
case CTRL_C_EVENT:
signum = SIGINT;
break;
#endif
#ifdef SIGTERM
case CTRL_CLOSE_EVENT: signum = SIGTERM; break;
case CTRL_CLOSE_EVENT:
signum = SIGTERM;
break;
#endif
#ifdef SIGBREAK
case CTRL_BREAK_EVENT: signum = SIGBREAK; break;
case CTRL_BREAK_EVENT:
signum = SIGBREAK;
break;
#endif
default: return FALSE;
default:
return FALSE;
}
if(signum) {
logmsg("ctrl_event_handler: %lu -> %d", dwCtrlType, signum);
@ -595,9 +602,13 @@ static LRESULT CALLBACK main_window_proc(HWND hwnd, UINT uMsg,
if(hwnd == hidden_main_window) {
switch(uMsg) {
#ifdef SIGTERM
case WM_CLOSE: signum = SIGTERM; break;
case WM_CLOSE:
signum = SIGTERM;
break;
#endif
case WM_DESTROY: PostQuitMessage(0); break;
case WM_DESTROY:
PostQuitMessage(0);
break;
}
if(signum) {
logmsg("main_window_proc: %d -> %d", uMsg, signum);
@ -671,7 +682,7 @@ static SIGHANDLER_T set_signal(int signum, SIGHANDLER_T handler,
sa.sa_handler = handler;
sigemptyset(&sa.sa_mask);
sigaddset(&sa.sa_mask, signum);
sa.sa_flags = restartable? SA_RESTART: 0;
sa.sa_flags = restartable ? SA_RESTART : 0;
if(sigaction(signum, &sa, &oldsa))
return SIG_ERR;

2
tests/unit/unit1309.c
View file

@ -46,7 +46,7 @@ static void splayprint(struct Curl_tree *t, int d, char output)
return;
splayprint(t->larger, d + 1, output);
for(i = 0; i<d; i++)
for(i = 0; i < d; i++)
if(output)
printf(" ");

2
tests/unit/unit1399.c
View file

@ -58,7 +58,7 @@ static bool usec_matches_seconds(timediff_t time_usec, int expected_seconds)
bool same = (time_sec == expected_seconds);
fprintf(stderr, "is %d us same as %d seconds? %s\n",
(int)time_usec, expected_seconds,
same?"Yes":"No");
same ? "Yes" : "No");
return same;
}

6
tests/unit/unit2600.c
View file

@ -234,7 +234,7 @@ static CURLcode cf_test_create(struct Curl_cfilter **pcf,
Curl_expire(data, ctx->fail_delay_ms, EXPIRE_RUN_NOW);
out:
*pcf = (!result)? cf : NULL;
*pcf = (!result) ? cf : NULL;
if(result) {
free(cf);
free(ctx);
@ -284,9 +284,9 @@ static void check_result(struct test_case *tc,
if(tr->cf6.creations && tr->cf4.creations && tc->pref_family) {
/* did ipv4 and ipv6 both, expect the preferred family to start right arway
* with the other being delayed by the happy_eyeball_timeout */
struct ai_family_stats *stats1 = !strcmp(tc->pref_family, "v6")?
struct ai_family_stats *stats1 = !strcmp(tc->pref_family, "v6") ?
&tr->cf6 : &tr->cf4;
struct ai_family_stats *stats2 = !strcmp(tc->pref_family, "v6")?
struct ai_family_stats *stats2 = !strcmp(tc->pref_family, "v6") ?
&tr->cf4 : &tr->cf6;
if(stats1->first_created > 100) {

2
tests/unit/unit2601.c
View file

@ -42,7 +42,7 @@ static const char *tail_err(struct bufq *q)
struct buf_chunk *chunk;
if(!q->tail) {
return q->head? "tail is NULL, but head is not" : NULL;
return q->head ? "tail is NULL, but head is not" : NULL;
}
chunk = q->head;