From c27d3b08c418c85da917b451fe8780e4159f9854 Mon Sep 17 00:00:00 2001 From: sin Date: Tue, 30 Sep 2014 17:03:25 +0100 Subject: Call fiforeset() if we fail to initiate the transfer --- ratox.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/ratox.c b/ratox.c index fc65b27..8b9fbaa 100644 --- a/ratox.c +++ b/ratox.c @@ -164,7 +164,6 @@ static Tox *tox; static Tox_Options toxopt; static uint8_t *passphrase; static uint32_t pplen; -static uint8_t toilet[PIPE_BUF]; static volatile sig_atomic_t running = 1; static int ipv6; static int tcpflag; @@ -1263,9 +1262,7 @@ loop(void) if (tox_new_file_sender(tox, f->num, 0, (uint8_t *)tstamp, strlen(tstamp)) < 0) { weprintf("Failed to initiate new transfer\n"); - /* Flush the FIFO */ - while (fiforead(f->dirfd, &f->fd[FFILE_IN], ffiles[FFILE_IN], - toilet, sizeof(toilet))); + fiforeset(f->dirfd, &f->fd[FFILE_IN], ffiles[FFILE_IN]); } else { f->tx.state = TRANSFER_INITIATED; printout(": %s : Tx > Initiated\n", f->name); -- cgit v1.2.3