Merge remote-tracking branch 'remotes/gkurz/tags/for-upstream' into staging

[qemu.git] / ui / vnc-enc-zlib.c

diff --git a/ui/vnc-enc-zlib.c b/ui/vnc-enc-zlib.c
index 3c6e6abf9482a5a9806ee15e19293c4623a4f15d..33e9df2f6adeef894742e9aadc0fdf258266b6b4 100644 (file)
--- a/ui/vnc-enc-zlib.c
+++ b/ui/vnc-enc-zlib.c
@@ -24,6 +24,7 @@
  * THE SOFTWARE.
  */
 
  * THE SOFTWARE.
  */
 

+#include "qemu/osdep.h"

 #include "vnc.h"
 
 #define ZALLOC_ALIGNMENT 16
 #include "vnc.h"
 
 #define ZALLOC_ALIGNMENT 16


@@ -35,14 +36,14 @@ void *vnc_zlib_zalloc(void *x, unsigned items, unsigned size)
     size *= items;
     size = (size + ZALLOC_ALIGNMENT - 1) & ~(ZALLOC_ALIGNMENT - 1);
 
     size *= items;
     size = (size + ZALLOC_ALIGNMENT - 1) & ~(ZALLOC_ALIGNMENT - 1);
 

-    p = qemu_mallocz(size);
+    p = g_malloc0(size);

 
     return (p);
 }
 
 void vnc_zlib_zfree(void *x, void *addr)
 {
 
     return (p);
 }
 
 void vnc_zlib_zfree(void *x, void *addr)
 {

-    qemu_free(addr);
+    g_free(addr);

 }
 
 static void vnc_zlib_start(VncState *vs)
 }
 
 static void vnc_zlib_start(VncState *vs)


@@ -103,8 +104,8 @@ static int vnc_zlib_stop(VncState *vs)
     zstream->avail_in = vs->zlib.zlib.offset;
     zstream->next_out = vs->output.buffer + vs->output.offset;
     zstream->avail_out = vs->output.capacity - vs->output.offset;
     zstream->avail_in = vs->zlib.zlib.offset;
     zstream->next_out = vs->output.buffer + vs->output.offset;
     zstream->avail_out = vs->output.capacity - vs->output.offset;

+    previous_out = zstream->avail_out;

     zstream->data_type = Z_BINARY;
     zstream->data_type = Z_BINARY;

-    previous_out = zstream->total_out;

 
     // start encoding
     if (deflate(zstream, Z_SYNC_FLUSH) != Z_OK) {
 
     // start encoding
     if (deflate(zstream, Z_SYNC_FLUSH) != Z_OK) {


@@ -113,7 +114,7 @@ static int vnc_zlib_stop(VncState *vs)
     }
 
     vs->output.offset = vs->output.capacity - zstream->avail_out;
     }
 
     vs->output.offset = vs->output.capacity - zstream->avail_out;

-    return zstream->total_out - previous_out;
+    return previous_out - zstream->avail_out;

 }
 
 int vnc_zlib_send_framebuffer_update(VncState *vs, int x, int y, int w, int h)
 }
 
 int vnc_zlib_send_framebuffer_update(VncState *vs, int x, int y, int w, int h)