bytemark/flexnbd-c
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Some debug and whitespace tweaks

Browse Source
This commit is contained in:
nick
2014-02-11 14:31:58 +00:00
parent 8084a41ad2
commit 27f2cc7083
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/client.c
View File

@@ -246,7 +246,6 @@ int client_read_request( struct client * client , struct nbd_request *out_reques
} }
nbd_r2h_request( &request_raw, out_request ); nbd_r2h_request( &request_raw, out_request );
return 1; return 1;
} }
@@ -260,7 +259,7 @@ int fd_write_reply( int fd, char *handle, int error )
memcpy( reply.handle, handle, 8 ); memcpy( reply.handle, handle, 8 );
nbd_h2r_reply( &reply, &reply_raw ); nbd_h2r_reply( &reply, &reply_raw );
debug( "Replying with %s, %d", handle, error ); debug( "Replying with handle=0x%08X, error=%"PRIu32, handle, error );
if( -1 == writeloop( fd, &reply_raw, sizeof( reply_raw ) ) ) { if( -1 == writeloop( fd, &reply_raw, sizeof( reply_raw ) ) ) {
switch( errno ) { switch( errno ) {
@@ -370,15 +369,15 @@ int client_request_needs_reply( struct client * client,
* forever. * forever.
*/ */
if (request.magic != REQUEST_MAGIC) { if (request.magic != REQUEST_MAGIC) {
warn("Bad magic 0x%08x from client", request.magic); warn("Bad magic 0x%08X from client", request.magic);
client_write_reply( client, &request, EBADMSG ); client_write_reply( client, &request, EBADMSG );
client->disconnect = 1; // no need to flush client->disconnect = 1; // no need to flush
return 0; return 0;
} }
debug( debug(
"request type=%"PRIu32", from=%"PRIu64", len=%"PRIu32, "request type=%"PRIu32", from=%"PRIu64", len=%"PRIu32", handle=0x%08X",
request.type, request.from, request.len request.type, request.from, request.len, request.handle
); );
/* check it's not out of range */ /* check it's not out of range */
@@ -407,7 +406,7 @@ int client_request_needs_reply( struct client * client,
return 0; return 0;
default: default:
fatal("Unknown request %08x", request.type); fatal("Unknown request 0x%08X", request.type);
} }
return 1; return 1;
} }
@@ -439,7 +438,7 @@ void client_reply_to_read( struct client* client, struct nbd_request request )
void client_reply_to_write( struct client* client, struct nbd_request request ) void client_reply_to_write( struct client* client, struct nbd_request request )
{ {
debug("request write %ld+%d", request.from, request.len); debug("request write from=%"PRIu64", len=%"PRIu32", handle=0x%08X", request.from, request.len, request.handle);
if (client->serve->allocation_map_built) { if (client->serve->allocation_map_built) {
write_not_zeroes( client, request.from, request.len ); write_not_zeroes( client, request.from, request.len );
} }
@@ -593,6 +592,7 @@ int client_serve_request(struct client* client)
client_disarm_killswitch( client ); client_disarm_killswitch( client );
return stop; return stop;
} }
if ( !client_request_needs_reply( client, request ) ) { if ( !client_request_needs_reply( client, request ) ) {
client_disarm_killswitch( client ); client_disarm_killswitch( client );
return client->disconnect; return client->disconnect;

2
src/ioutil.c
View File

@@ -139,7 +139,7 @@ int readloop(int filedes, void *buffer, size_t size)
ssize_t result = read(filedes, buffer+readden, size-readden); ssize_t result = read(filedes, buffer+readden, size-readden);
if ( result == 0 /* EOF */ ) { if ( result == 0 /* EOF */ ) {
warn( "end-of-file detected while reading" ); warn( "end-of-file detected while reading after %i bytes", readden );
return -1; return -1;
} }