philippelh/bitchx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Simplify dcc_send_socketread()

Browse Source 
There should be no change in behaviour.  Replaces a code block of the form:

if (a || b)
{
    if (c && a)
    {
        /* one */
    }
    else if (b)
    {
        /* two */
    }
}

with the simpler equivalent:

if (c && a)
{
    /* one */
}
else if (b)
{
    /* two */
}
This commit is contained in:
Kevin Easton
2018-04-12 00:20:13 +10:00
parent 99c5ec9872
commit 208fddb9f5
1 changed files with 52 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

98
source/dcc.c
View File

@@ -1791,66 +1791,70 @@ void close_dcc_file(int snum)
void BX_dcc_send_socketread(int snum) void BX_dcc_send_socketread(int snum)
{ {
SocketList *s; SocketList *s;
DCC_int *n; DCC_int *n;
u_32int_t bytes = 0; int bytesread = 0;
int bytesread = 0; char buffer[MAX_DCC_BLOCK_SIZE+1];
char *buffer = alloca(MAX_DCC_BLOCK_SIZE+1);
s = get_socket(snum); s = get_socket(snum);
n = (DCC_int *)s->info; n = (DCC_int *)s->info;
if (n->readwaiting || n->eof)
if (!(s->flags & DCC_TDCC) && n->readwaiting)
{ {
/* n->readwaiting is set when we have sent a block and are waiting for an acknowledgement. */
int numbytes = 0; int numbytes = 0;
if (!(s->flags & DCC_TDCC) && n->readwaiting) u_32int_t bytes = 0;
if ((ioctl(snum, FIONREAD, &numbytes)) == -1)
{ {
if ((ioctl(snum, FIONREAD, &numbytes)) == -1) erase_dcc_info(snum, 1, convert_output_format("$G %RDCC%n Remote $0 closed dcc send", "%s", s->server));
{ close_socketread(snum);
erase_dcc_info(snum, 1, convert_output_format("$G %RDCC%n Remote $0 closed dcc send", "%s", s->server)); return;
close_socketread(snum);
return;
}
if (numbytes)
{
if (read(snum, &bytes, sizeof bytes) < (int)sizeof bytes)
{
erase_dcc_info(snum, 1, convert_output_format("$G %RDCC%n Remote closed dcc send", NULL));
close_socketread(snum);
}
bytes = (unsigned long)ntohl(bytes);
get_time(&n->lasttime);
if (bytes == (n->filesize - n->transfer_orders.byteoffset))
{
close_dcc_file(snum);
return;
}
else if (!n->dcc_fast && (bytes != n->bytes_sent))
return;
n->readwaiting = 0;
}
} }
else if (n->eof) if (numbytes)
{ {
u_32int_t *buf; if (read(snum, &bytes, sizeof bytes) < (int)sizeof bytes)
n->readwaiting = 1; {
if ((ioctl(snum, FIONREAD, &numbytes) == -1)) erase_dcc_info(snum, 1, convert_output_format("$G %RDCC%n Remote closed dcc send", NULL));
close_socketread(snum);
}
bytes = (unsigned long)ntohl(bytes);
get_time(&n->lasttime);
if (bytes == (n->filesize - n->transfer_orders.byteoffset))
{ {
close_dcc_file(snum); close_dcc_file(snum);
return; return;
} }
buf = alloca(numbytes+1); else if (!n->dcc_fast && (bytes != n->bytes_sent))
numbytes = read(snum, buf, numbytes); return;
switch(numbytes) n->readwaiting = 0;
{ }
case -1: }
erase_dcc_info(snum, 1, convert_output_format("$G %RDCC%n Remote $0 closed dcc send", "%s", s->server)); else if (n->eof)
close_socketread(snum); {
break; /* n->eof is set if read() on the file we are sending returns EOF or error. */
case 0: int numbytes = 0;
close_dcc_file(snum); u_32int_t *buf;
break;
} n->readwaiting = 1;
if ((ioctl(snum, FIONREAD, &numbytes) == -1))
{
close_dcc_file(snum);
return; return;
} }
buf = alloca(numbytes+1);
numbytes = read(snum, buf, numbytes);
switch(numbytes)
{
case -1:
erase_dcc_info(snum, 1, convert_output_format("$G %RDCC%n Remote $0 closed dcc send", "%s", s->server));
close_socketread(snum);
break;
case 0:
close_dcc_file(snum);
break;
}
return;
} }
if ((bytesread = read(n->file, buffer, n->blocksize)) > 0) if ((bytesread = read(n->file, buffer, n->blocksize)) > 0)