romenskiy2012/curl
1
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2026-08-26 21:24:08 +03:00
Code Issues Projects Releases Packages Wiki Activity

tidy-up: one more round of formatting nits

Browse source 
Closes #19835
This commit is contained in:
Viktor Szakats 2025-11-29 23:11:52 +01:00
parent 7a1e99eefa
commit 0476e4fc65
No known key found for this signature in database
GPG key ID: B5ABD165E2AEF201
149 changed files with 1381 additions and 1376 deletions
Download patch file Download diff file Expand all files Collapse all files

38
tests/server/tftpd.c
View file

@ -70,8 +70,8 @@
#include <ctype.h>
/*****************************************************************************
* This is a rewrite/clone of the arpa/tftp.h file for systems without it. *
*****************************************************************************/
* This is a rewrite/clone of the arpa/tftp.h file for systems without it. *
*****************************************************************************/
#define SEGSIZE 512 /* data segment size */
#if defined(__GNUC__) && ((__GNUC__ >= 3) || \
@ -105,8 +105,8 @@ struct tftphdr {
#define TFTP_ENOUSER 7
/*****************************************************************************
* STRUCT DECLARATIONS AND DEFINES *
*****************************************************************************/
* STRUCT DECLARATIONS AND DEFINES *
*****************************************************************************/
#ifndef PKTSIZE
#define PKTSIZE (SEGSIZE + 4) /* SEGSIZE defined in arpa/tftp.h */
@ -157,13 +157,13 @@ struct bf {
#define opcode_ACK 4
#define opcode_ERROR 5
#define TIMEOUT 5
#define TIMEOUT 5
#define REQUEST_DUMP "server.input"
#define REQUEST_DUMP "server.input"
/*****************************************************************************
* GLOBAL VARIABLES *
*****************************************************************************/
* GLOBAL VARIABLES *
*****************************************************************************/
static struct errmsg errmsgs[] = {
{ TFTP_EUNDEF, "Undefined error code" },
@ -212,8 +212,8 @@ static const unsigned int rexmtval = TIMEOUT;
#endif
/*****************************************************************************
* FUNCTION PROTOTYPES *
*****************************************************************************/
* FUNCTION PROTOTYPES *
*****************************************************************************/
static struct tftphdr *rw_init(int);
@ -249,8 +249,8 @@ static void justtimeout(int signum);
#endif /* HAVE_ALARM && SIGALRM */
/*****************************************************************************
* FUNCTION IMPLEMENTATIONS *
*****************************************************************************/
* FUNCTION IMPLEMENTATIONS *
*****************************************************************************/
#if defined(HAVE_ALARM) && defined(SIGALRM)
@ -482,9 +482,8 @@ static ssize_t write_behind(struct testcase *test, int convert)
if(prevchar == '\r') { /* if prev char was cr */
if(c == '\n') /* if have cr,lf then just */
lseek(test->ofile, -1, SEEK_CUR); /* smash lf on top of the cr */
else
if(c == '\0') /* if have cr,nul then */
goto skipit; /* just skip over the putc */
else if(c == '\0') /* if have cr,nul then */
goto skipit; /* just skip over the putc */
/* else just fall through and allow it */
}
/* formerly
@ -1204,8 +1203,7 @@ static void sendtftp(struct testcase *test, const struct formats *pf)
(void)sigsetjmp(timeoutbuf, 1);
#endif
if(test->writedelay) {
logmsg("Pausing %d seconds before %d bytes", test->writedelay,
size);
logmsg("Pausing %d seconds before %d bytes", test->writedelay, size);
curlx_wait_ms(1000 * test->writedelay);
}
@ -1299,7 +1297,7 @@ send_ack:
#endif
if(got_exit_signal)
goto abort;
if(n < 0) { /* really? */
if(n < 0) { /* really? */
logmsg("read: fail");
goto abort;
}
@ -1313,13 +1311,13 @@ send_ack:
}
/* Re-synchronize with the other side */
(void)synchnet(peer);
if(rdp->th_block == (recvblock-1))
if(rdp->th_block == (recvblock - 1))
goto send_ack; /* rexmit */
}
}
size = writeit(test, &rdp, (int)(n - 4), pf->f_convert);
if(size != (n-4)) { /* ahem */
if(size != (n - 4)) { /* ahem */
if(size < 0)
nak(errno + 100);
else