diff options
| author | Simon Rettberg | 2016-03-22 15:58:13 +0100 |
|---|---|---|
| committer | Simon Rettberg | 2016-03-22 15:58:13 +0100 |
| commit | 549a53070ae03b47e11943727afe4f8927cb6c42 (patch) | |
| tree | 58aa2d01553a862964040f1e160b9366c1f2a8fc /src/server/altservers.c | |
| parent | [SERVER] (FreeBSD) Unlock send mutex on sendfile error (diff) | |
| download | dnbd3-549a53070ae03b47e11943727afe4f8927cb6c42.tar.gz dnbd3-549a53070ae03b47e11943727afe4f8927cb6c42.tar.xz dnbd3-549a53070ae03b47e11943727afe4f8927cb6c42.zip | |
[SERVER] Fix formatting
Diffstat (limited to 'src/server/altservers.c')
| -rw-r--r-- | src/server/altservers.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/server/altservers.c b/src/server/altservers.c index bccf758..9413421 100644 --- a/src/server/altservers.c +++ b/src/server/altservers.c @@ -265,8 +265,8 @@ static unsigned int altservers_updateRtt(const dnbd3_host_t * const host, const if ( !isSameAddressPort( host, &altServers[i].host ) ) continue; altServers[i].rtt[++altServers[i].rttIndex % SERVER_RTT_PROBES] = rtt; #if SERVER_RTT_PROBES == 5 - avg = (altServers[i].rtt[0] + altServers[i].rtt[1] + altServers[i].rtt[2] + altServers[i].rtt[3] + altServers[i].rtt[4]) - / SERVER_RTT_PROBES; + avg = (altServers[i].rtt[0] + altServers[i].rtt[1] + altServers[i].rtt[2] + + altServers[i].rtt[3] + altServers[i].rtt[4]) / SERVER_RTT_PROBES; #else #warning You might want to change the code in altservers_update_rtt if you changed SERVER_RTT_PROBES avg = 0; @@ -436,11 +436,11 @@ static void *altservers_main(void *data UNUSED) } if ( rid != image->rid ) { ERROR_GOTO( server_failed, "[RTT] Server provides rid %d, requested was %d (%s)", - (int)rid, (int)image->rid, image->name ); + (int)rid, (int)image->rid, image->name ); } if ( imageSize != image->virtualFilesize ) { ERROR_GOTO( server_failed, "[RTT] Remote size: %" PRIu64 ", expected: %" PRIu64 " (%s)", - imageSize, image->virtualFilesize, image->name ); + imageSize, image->virtualFilesize, image->name ); } // Request first block (NOT random!) ++++++++++++++++++++++++++++++ fixup_request( request ); @@ -452,12 +452,12 @@ static void *altservers_main(void *data UNUSED) char buf[100] = { 0 }; host_to_string( &servers[itAlt], buf, 100 ); ERROR_GOTO( server_failed, "[RTT] Received corrupted reply header (%s) after CMD_GET_BLOCK (%s)", - buf, image->name ); + buf, image->name ); } // check reply header if ( reply.cmd != CMD_GET_BLOCK || reply.size != DNBD3_BLOCK_SIZE ) { ERROR_GOTO( server_failed, "[RTT] Reply to first block request is %d bytes for %s", - reply.size, image->name ); + reply.size, image->name ); } if ( recv( sock, buffer, DNBD3_BLOCK_SIZE, MSG_WAITALL ) != DNBD3_BLOCK_SIZE ) { ERROR_GOTO( server_failed, "[RTT] Could not read first block payload for %s", image->name ); |