[Spice-commits] 3 commits - server/dispatcher.c server/glz-encode.tmpl.c server/stream.h

[Pavel Grunt]

 server/dispatcher.c      |    2 ++
 server/glz-encode.tmpl.c |    2 +-
 server/stream.h          |    1 -
 3 files changed, 3 insertions(+), 2 deletions(-)

New commits:
commit a68c821164b2992f0ca032a1a04db9aecf4c4792
Author: Pavel Grunt <pgrunt at redhat.com>
Date:   Thu Jun 30 11:17:50 2016 +0200

    Fix -Werror=format with DEBUG_ENCODE
    
    Acked-by: Jonathon Jongsma <jjongsma at redhat.com>

diff --git a/server/glz-encode.tmpl.c b/server/glz-encode.tmpl.c
index d699499..4874a94 100644
--- a/server/glz-encode.tmpl.c
+++ b/server/glz-encode.tmpl.c
@@ -365,7 +365,7 @@ static void FNAME(compress_seg)(Encoder *encoder, uint32_t seg_idx, PIXEL *from,
 
 match:        // RLE or dictionary (both are encoded by distance from ref (-1) and length)
 #ifdef DEBUG_ENCODE
-        printf(", match(%d, %d, %d)", image_dist, pix_dist, len);
+        printf(", match(%zu, %zu, %zu)", image_dist, pix_dist, len);
         n_encoded += len;
 #endif
 
commit 3a06113ce4ea80295d1fc62b322060dfe024c75c
Author: Pavel Grunt <pgrunt at redhat.com>
Date:   Thu Jun 30 11:17:49 2016 +0200

    Do not force computing streaming statistic
    
    Let user to define STREAM_STATS to enable them
    
    Acked-by: Jonathon Jongsma <jjongsma at redhat.com>

diff --git a/server/stream.h b/server/stream.h
index 9dcb8f7..b4fe540 100644
--- a/server/stream.h
+++ b/server/stream.h
@@ -52,7 +52,6 @@ typedef struct RedStreamActivateReportItem {
     uint32_t stream_id;
 } RedStreamActivateReportItem;
 
-#define STREAM_STATS
 #ifdef STREAM_STATS
 typedef struct StreamStats {
     uint64_t num_drops_pipe;
commit fb1b30a0e56ef38d1a9d90337c9468e111603f34
Author: Pavel Grunt <pgrunt at redhat.com>
Date:   Thu Jun 30 11:17:48 2016 +0200

    Fix compiling with defined DEBUG_DISPATCHER
    
    setup_dummy_signal_handler was used before declared
    
    Acked-by: Jonathon Jongsma <jjongsma at redhat.com>

diff --git a/server/dispatcher.c b/server/dispatcher.c
index 8c55881..44624cc 100644
--- a/server/dispatcher.c
+++ b/server/dispatcher.c
@@ -36,6 +36,8 @@
 
 #ifdef DEBUG_DISPATCHER
 #include <signal.h>
+
+static void setup_dummy_signal_handler(void);
 #endif
 
 G_DEFINE_TYPE(Dispatcher, dispatcher, G_TYPE_OBJECT)