diff options
Diffstat (limited to 'tests/server')
| -rw-r--r-- | tests/server/fake_ntlm.c | 3 | ||||
| -rw-r--r-- | tests/server/getpart.c | 12 | ||||
| -rw-r--r-- | tests/server/rtspd.c | 6 | ||||
| -rw-r--r-- | tests/server/sws.c | 8 | ||||
| -rw-r--r-- | tests/server/tftpd.c | 2 |
5 files changed, 16 insertions, 15 deletions
diff --git a/tests/server/fake_ntlm.c b/tests/server/fake_ntlm.c index 2d547ffae..ca2b438b6 100644 --- a/tests/server/fake_ntlm.c +++ b/tests/server/fake_ntlm.c @@ -63,7 +63,8 @@ static char *printable(char *inbuf, size_t inlength) inlength = strlen(inbuf); if(inlength) { - outincr = ((inlength/2) < (HEX_STR_LEN+1)) ? HEX_STR_LEN+1 : inlength/2; + outincr = ((inlength/2) < (HEX_STR_LEN + 1)) ? + HEX_STR_LEN + 1 : inlength/2; outsize = inlength + outincr; } else diff --git a/tests/server/getpart.c b/tests/server/getpart.c index bb8351bc3..b97ad2e66 100644 --- a/tests/server/getpart.c +++ b/tests/server/getpart.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2016, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2017, Daniel Stenberg, <daniel@haxx.se>, et al. * * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms @@ -250,11 +250,11 @@ int getpart(char **outbuf, size_t *outlen, const char *main, const char *sub, FILE *stream) { # define MAX_TAG_LEN 79 - char couter[MAX_TAG_LEN+1]; /* current outermost section */ - char cmain[MAX_TAG_LEN+1]; /* current main section */ - char csub[MAX_TAG_LEN+1]; /* current sub section */ - char ptag[MAX_TAG_LEN+1]; /* potential tag */ - char patt[MAX_TAG_LEN+1]; /* potential attributes */ + char couter[MAX_TAG_LEN + 1]; /* current outermost section */ + char cmain[MAX_TAG_LEN + 1]; /* current main section */ + char csub[MAX_TAG_LEN + 1]; /* current sub section */ + char ptag[MAX_TAG_LEN + 1]; /* potential tag */ + char patt[MAX_TAG_LEN + 1]; /* potential attributes */ char *buffer = NULL; char *ptr; char *end; diff --git a/tests/server/rtspd.c b/tests/server/rtspd.c index 8f004e120..53ffeb6e1 100644 --- a/tests/server/rtspd.c +++ b/tests/server/rtspd.c @@ -500,7 +500,7 @@ static int ProcessRequest(struct httprequest *req) SET_RTP_PKT_LEN(rtp_scratch, rtp_size); /* Fill it with junk data */ - for(i = 0; i < rtp_size; i+= RTP_DATA_SIZE) { + for(i = 0; i < rtp_size; i += RTP_DATA_SIZE) { memcpy(rtp_scratch + 4 + i, RTP_DATA, RTP_DATA_SIZE); } @@ -554,8 +554,8 @@ static int ProcessRequest(struct httprequest *req) /* if the host name starts with test, the port number used in the CONNECT line will be used as test number! */ char *portp = strchr(doc, ':'); - if(portp && (*(portp+1) != '\0') && ISDIGIT(*(portp+1))) - req->testno = strtol(portp+1, NULL, 10); + if(portp && (*(portp + 1) != '\0') && ISDIGIT(*(portp + 1))) + req->testno = strtol(portp + 1, NULL, 10); else req->testno = DOCNUMBER_CONNECT; } diff --git a/tests/server/sws.c b/tests/server/sws.c index 5fcd6732b..993fefcf7 100644 --- a/tests/server/sws.c +++ b/tests/server/sws.c @@ -578,18 +578,18 @@ static int ProcessRequest(struct httprequest *req) } if(*p != ']') logmsg("Invalid CONNECT IPv6 address format"); - else if(*(p+1) != ':') + else if(*(p + 1) != ':') logmsg("Invalid CONNECT IPv6 port format"); else - portp = p+1; + portp = p + 1; req->testno = part; } else portp = strchr(doc, ':'); - if(portp && (*(portp+1) != '\0') && ISDIGIT(*(portp+1))) { - unsigned long ulnum = strtoul(portp+1, NULL, 10); + if(portp && (*(portp + 1) != '\0') && ISDIGIT(*(portp + 1))) { + unsigned long ulnum = strtoul(portp + 1, NULL, 10); if(!ulnum || (ulnum > 65535UL)) logmsg("Invalid CONNECT port received"); else diff --git a/tests/server/tftpd.c b/tests/server/tftpd.c index 1932ea411..a8b565197 100644 --- a/tests/server/tftpd.c +++ b/tests/server/tftpd.c @@ -992,7 +992,7 @@ static int do_tftp(struct testcase *test, struct tftphdr *tp, ssize_t size) /* before increasing pointer, make sure it is still within the legal space */ - if((cp+1) < &buf.storage[size]) { + if((cp + 1) < &buf.storage[size]) { ++cp; if(first) { /* store the mode since we need it later */ |