empire/empserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Simplify recvclient() to return -1 for all failures

Browse source 
Callers don't care.  Also fix some comments.
This commit is contained in:
Markus Armbruster 2012-01-28 17:49:20 +01:00
parent 16879f3db2
commit 5585dda091
1 changed files with 6 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/lib/player/recvclient.c
View file

@ -41,17 +41,16 @@
/* /*
* Receive a line of input from the current player. * Receive a line of input from the current player.
* If the player's eof flag is set, return -1 without receiving input. * If the player's aborted flag is set, return -1 without receiving
* If the player's aborted flag is set, return -2 without receiving
* input. * input.
* Else receive one line and store it in CMD[SIZE]. * Else receive one line and store it in CMD[SIZE].
* This may block for input, yielding the processor. Flush buffered * This may block for input, yielding the processor. Flush buffered
* output when blocking, to make sure player sees the prompt. * output when blocking, to make sure player sees the prompt.
* If the player's connection has the I/O error or EOF indicator set, * If the player's connection has the I/O error or EOF indicator set,
* or the line is "ctld", set the player's eof and aborted flag and * or we block and time out, or the line is "ctld", set the player's
* return -1. * eof and aborted flag and return -1.
* If the line is "aborted", set the player's aborted flag and return * If the line is "aborted", set the player's aborted flag and return
* -2. * -1.
* Else return the length of the line. * Else return the length of the line.
* Design bug: there is no way to indicate truncation of a long line. * Design bug: there is no way to indicate truncation of a long line.
*/ */
@ -83,7 +82,7 @@ recvclient(char *cmd, int size)
; ;
/* /*
* If io_output_all() blocked and got unblocked by command * If io_output() blocked and got unblocked by command
* abortion, we must return without blocking in io_input(). * abortion, we must return without blocking in io_input().
*/ */
if (player->aborted) if (player->aborted)
@ -112,7 +111,7 @@ recvclient(char *cmd, int size)
CANT_HAPPEN(player->recvfail == 256); CANT_HAPPEN(player->recvfail == 256);
empth_sleep(time(NULL) + 60); empth_sleep(time(NULL) + 60);
} }
return player->eof ? -1 : -2; return -1;
} }
player->recvfail = 0; player->recvfail = 0;