client: simplified client_read()

Remove one comparison by changing branch order.

client: simplified client_read()
9ceadb05 · Max Kellermann · 1bb15409 · 9ceadb05
Commit 9ceadb05 authored Sep 10, 2008 by Max Kellermann
Show whitespace changes
Inline Side-by-side

Showing with 5 additions and 3 deletions

client.c src/client.c +5 -3

No files found.
--- a/src/client.c
+++ b/src/client.c
@@ -453,10 +453,12 @@ static int client_read(struct client *client)

 	if (bytesRead > 0)
 		return client_input_received(client, bytesRead);
-	else if (bytesRead == 0 || (bytesRead < 0 && errno != EINTR)) {
-		return COMMAND_RETURN_CLOSE;
-	} else
+	else if (bytesRead < 0 && errno == EINTR)
+		/* try again later, after select() */
 		return 0;
+	else
+		/* peer disconnected or I/O error */
+		return COMMAND_RETURN_CLOSE;
 }

 static void client_manager_register_read_fd(fd_set * fds, int *fdmax)