Merge, just renaming old error macros.

This commit is contained in:
Matthew Bloch
2012-06-09 02:37:23 +01:00
10 changed files with 502 additions and 87 deletions

View File

@@ -171,8 +171,9 @@ int client_read_request( struct client * client , struct nbd_request *out_reques
FATAL_IF_NEGATIVE(select(FD_SETSIZE, &fds, NULL, NULL, NULL),
"select() failed");
if ( self_pipe_fd_isset( client->stop_signal, &fds ) )
if ( self_pipe_fd_isset( client->stop_signal, &fds ) ){
return 0;
}
if (readloop(client->socket, &request_raw, sizeof(request_raw)) == -1) {
if (errno == 0) {