[Spice-commits] 3 commits - server/mjpeg_encoder.c server/red_channel.c server/red_channel.h server/reds.c

[Christophe Fergau]

 server/mjpeg_encoder.c |    2 +-
 server/red_channel.c   |   14 +++++++-------
 server/red_channel.h   |    2 +-
 server/reds.c          |    6 +++---
 4 files changed, 12 insertions(+), 12 deletions(-)

New commits:
commit 660d63253d26e96f3ddf0fc28608dbb345052bbe
Author: Christophe Fergeau <cfergeau at redhat.com>
Date:   Tue Mar 4 17:26:21 2014 +0100

    Fix test_capability() typo
    
    It was spelt 'capabilty'

diff --git a/server/red_channel.c b/server/red_channel.c
index b81deeb..4f85365 100644
--- a/server/red_channel.c
+++ b/server/red_channel.c
@@ -684,16 +684,16 @@ static void red_channel_client_destroy_remote_caps(RedChannelClient* rcc)
 
 int red_channel_client_test_remote_common_cap(RedChannelClient *rcc, uint32_t cap)
 {
-    return test_capabilty(rcc->remote_caps.common_caps,
-                          rcc->remote_caps.num_common_caps,
-                          cap);
+    return test_capability(rcc->remote_caps.common_caps,
+                           rcc->remote_caps.num_common_caps,
+                           cap);
 }
 
 int red_channel_client_test_remote_cap(RedChannelClient *rcc, uint32_t cap)
 {
-    return test_capabilty(rcc->remote_caps.caps,
-                          rcc->remote_caps.num_caps,
-                          cap);
+    return test_capability(rcc->remote_caps.caps,
+                           rcc->remote_caps.num_caps,
+                           cap);
 }
 
 int red_channel_test_remote_common_cap(RedChannel *channel, uint32_t cap)
@@ -1172,7 +1172,7 @@ void red_channel_register_client_cbs(RedChannel *channel, ClientCbs *client_cbs)
     }
 }
 
-int test_capabilty(uint32_t *caps, int num_caps, uint32_t cap)
+int test_capability(uint32_t *caps, int num_caps, uint32_t cap)
 {
     uint32_t index = cap / 32;
     if (num_caps < index + 1) {
diff --git a/server/red_channel.h b/server/red_channel.h
index f638d3c..f9cfb95 100644
--- a/server/red_channel.h
+++ b/server/red_channel.h
@@ -223,7 +223,7 @@ typedef struct RedChannelCapabilities {
     uint32_t *caps;
 } RedChannelCapabilities;
 
-int test_capabilty(uint32_t *caps, int num_caps, uint32_t cap);
+int test_capability(uint32_t *caps, int num_caps, uint32_t cap);
 
 typedef struct RedChannelClientLatencyMonitor {
     int state;
diff --git a/server/reds.c b/server/reds.c
index 2d0c1c0..2ef4aad 100644
--- a/server/reds.c
+++ b/server/reds.c
@@ -2054,8 +2054,8 @@ static void reds_handle_read_link_done(void *opaque)
         return;
     }
 
-    auth_selection = test_capabilty(caps, link_mess->num_common_caps,
-                                    SPICE_COMMON_CAP_PROTOCOL_AUTH_SELECTION);
+    auth_selection = test_capability(caps, link_mess->num_common_caps,
+                                     SPICE_COMMON_CAP_PROTOCOL_AUTH_SELECTION);
 
     if (!reds_security_check(link)) {
         if (reds_stream_is_ssl(link->stream)) {
commit 24e2e60a599d531090d98b46972d75be8d49ff46
Author: Christophe Fergeau <cfergeau at redhat.com>
Date:   Tue Mar 4 12:05:30 2014 +0100

    Fix typo in log message

diff --git a/server/reds.c b/server/reds.c
index 1f02553..2d0c1c0 100644
--- a/server/reds.c
+++ b/server/reds.c
@@ -1359,7 +1359,7 @@ static int reds_send_link_ack(RedLinkInfo *link)
     ack.caps_offset = sizeof(SpiceLinkReply);
 
     if (!(link->tiTicketing.rsa = RSA_new())) {
-        spice_warning("RSA nes failed");
+        spice_warning("RSA new failed");
         return FALSE;
     }
 
commit 67be56ad8a6b10a5307939a700115d6be3fb8433
Author: Christophe Fergeau <cfergeau at redhat.com>
Date:   Wed Feb 26 15:40:55 2014 +0100

    mjpeg: Don't warn on unsupported image formats
    
    When trying to start mjpeg compression mode, mjpeg_encoder_start_frame()
    tests the image format as its only able to compress 24/32bpp images. On
    images with lower bit depths, we return MJPEG_ENCODER_FRAME_UNSUPPORTED to
    indicate this is not a format we can compress. However, this return goes
    with a spice_warning("unsupported format"). As the rest of the code can
    cope with this unsupported format by not doing mjpeg compression, it's
    nicer to downgrade this spice_warning() to spice_debug().
    
    This fixes https://bugzilla.redhat.com/show_bug.cgi?id=1070028

diff --git a/server/mjpeg_encoder.c b/server/mjpeg_encoder.c
index 04b244e..aea4964 100644
--- a/server/mjpeg_encoder.c
+++ b/server/mjpeg_encoder.c
@@ -796,7 +796,7 @@ int mjpeg_encoder_start_frame(MJpegEncoder *encoder, SpiceBitmapFmt format,
 #endif
         break;
     default:
-        spice_warning("unsupported format %d", format);
+        spice_debug("unsupported format %d", format);
         return MJPEG_ENCODER_FRAME_UNSUPPORTED;
     }