[Spice-commits] 2 commits - server/red_channel.c

[Christophe Fergau]

 server/red_channel.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 7b0ad8d44c9572bca12910f75156a366942fc512
Author: Frediano Ziglio <fziglio at redhat.com>
Date:   Wed Jun 10 10:45:24 2015 +0100

    Fix typo in comment
    
    Signed-off-by: Frediano Ziglio <fziglio at redhat.com>

diff --git a/server/red_channel.c b/server/red_channel.c
index 946b593..2a273e9 100644
--- a/server/red_channel.c
+++ b/server/red_channel.c
@@ -539,7 +539,7 @@ static void red_channel_client_send_ping(RedChannelClient *rcc)
         /*
          * When testing latency, TCP_NODELAY must be switched on, otherwise,
          * sending the ping message is delayed by Nagle algorithm, and the
-         * roundtrip measurment is less accurate (bigger).
+         * roundtrip measurement is less accurate (bigger).
          */
         rcc->latency_monitor.tcp_nodelay = 1;
         if (getsockopt(rcc->stream->socket, IPPROTO_TCP, TCP_NODELAY, &delay_val,
commit 6ec714e855bddb3a68cb172d52bbd8e8eecf64fa
Author: Frediano Ziglio <fziglio at redhat.com>
Date:   Wed Jun 10 10:45:25 2015 +0100

    Use MIN macro to compute a minimum
    
    Signed-off-by: Frediano Ziglio <fziglio at redhat.com>

diff --git a/server/red_channel.c b/server/red_channel.c
index 6dc9bf1..946b593 100644
--- a/server/red_channel.c
+++ b/server/red_channel.c
@@ -2309,7 +2309,7 @@ uint32_t red_channel_min_pipe_size(RedChannel *channel)
 
     RING_FOREACH(link, &channel->clients) {
         rcc = SPICE_CONTAINEROF(link, RedChannelClient, channel_link);
-        pipe_size = pipe_size < rcc->pipe_size ? pipe_size : rcc->pipe_size;
+        pipe_size = MIN(pipe_size, rcc->pipe_size);
     }
     return pipe_size == ~0 ? 0 : pipe_size;
 }