Re: [Spice-devel] [PATCH spice-server v2 08/23] char-device: Use GLib memory functions

2017-09-22 Thread Jonathon Jongsma
Acked-by: Jonathon Jongsma 


On Wed, 2017-09-20 at 08:51 +0100, Frediano Ziglio wrote:
> Signed-off-by: Frediano Ziglio 
> ---
>  server/char-device.c | 12 ++--
>  1 file changed, 6 insertions(+), 6 deletions(-)
> 
> diff --git a/server/char-device.c b/server/char-device.c
> index 658f9f364..ef361b7ac 100644
> --- a/server/char-device.c
> +++ b/server/char-device.c
> @@ -150,8 +150,8 @@ static void
> red_char_device_write_buffer_free(RedCharDeviceWriteBuffer *buf)
>  if (buf == NULL)
>  return;
>  
> -free(buf->buf);
> -free(buf);
> +g_free(buf->buf);
> +g_free(buf);
>  }
>  
>  static void write_buffers_queue_free(GQueue *write_queue)
> @@ -210,7 +210,7 @@ static void
> red_char_device_client_free(RedCharDevice *dev,
>  }
>  
>  dev->priv->clients = g_list_remove(dev->priv->clients,
> dev_client);
> -free(dev_client);
> +g_free(dev_client);
>  }
>  
>  static void
> red_char_device_handle_client_overflow(RedCharDeviceClient
> *dev_client)
> @@ -550,7 +550,7 @@ static RedCharDeviceWriteBuffer
> *__red_char_device_write_buffer_get(
>  RedCharDeviceWriteBuffer buffer;
>  RedCharDeviceWriteBufferPrivate priv;
>  } *write_buf;
> -write_buf = spice_new0(struct RedCharDeviceWriteBufferFull,
> 1);
> +write_buf = g_new0(struct RedCharDeviceWriteBufferFull, 1);
>  ret = _buf->buffer;
>  ret->priv = _buf->priv;
>  }
> @@ -558,7 +558,7 @@ static RedCharDeviceWriteBuffer
> *__red_char_device_write_buffer_get(
>  spice_assert(!ret->buf_used);
>  
>  if (ret->buf_size < size) {
> -ret->buf = spice_realloc(ret->buf, size);
> +ret->buf = g_realloc(ret->buf, size);
>  ret->buf_size = size;
>  }
>  ret->priv->origin = origin;
> @@ -709,7 +709,7 @@ static RedCharDeviceClient
> *red_char_device_client_new(RedClient *client,
>  {
>  RedCharDeviceClient *dev_client;
>  
> -dev_client = spice_new0(RedCharDeviceClient, 1);
> +dev_client = g_new0(RedCharDeviceClient, 1);
>  dev_client->client = client;
>  dev_client->send_queue = g_queue_new();
>  dev_client->max_send_queue_size = max_send_queue_size;
___
Spice-devel mailing list
Spice-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/spice-devel


[Spice-devel] [PATCH spice-server v2 08/23] char-device: Use GLib memory functions

2017-09-20 Thread Frediano Ziglio
Signed-off-by: Frediano Ziglio 
---
 server/char-device.c | 12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/server/char-device.c b/server/char-device.c
index 658f9f364..ef361b7ac 100644
--- a/server/char-device.c
+++ b/server/char-device.c
@@ -150,8 +150,8 @@ static void 
red_char_device_write_buffer_free(RedCharDeviceWriteBuffer *buf)
 if (buf == NULL)
 return;
 
-free(buf->buf);
-free(buf);
+g_free(buf->buf);
+g_free(buf);
 }
 
 static void write_buffers_queue_free(GQueue *write_queue)
@@ -210,7 +210,7 @@ static void red_char_device_client_free(RedCharDevice *dev,
 }
 
 dev->priv->clients = g_list_remove(dev->priv->clients, dev_client);
-free(dev_client);
+g_free(dev_client);
 }
 
 static void red_char_device_handle_client_overflow(RedCharDeviceClient 
*dev_client)
@@ -550,7 +550,7 @@ static RedCharDeviceWriteBuffer 
*__red_char_device_write_buffer_get(
 RedCharDeviceWriteBuffer buffer;
 RedCharDeviceWriteBufferPrivate priv;
 } *write_buf;
-write_buf = spice_new0(struct RedCharDeviceWriteBufferFull, 1);
+write_buf = g_new0(struct RedCharDeviceWriteBufferFull, 1);
 ret = _buf->buffer;
 ret->priv = _buf->priv;
 }
@@ -558,7 +558,7 @@ static RedCharDeviceWriteBuffer 
*__red_char_device_write_buffer_get(
 spice_assert(!ret->buf_used);
 
 if (ret->buf_size < size) {
-ret->buf = spice_realloc(ret->buf, size);
+ret->buf = g_realloc(ret->buf, size);
 ret->buf_size = size;
 }
 ret->priv->origin = origin;
@@ -709,7 +709,7 @@ static RedCharDeviceClient 
*red_char_device_client_new(RedClient *client,
 {
 RedCharDeviceClient *dev_client;
 
-dev_client = spice_new0(RedCharDeviceClient, 1);
+dev_client = g_new0(RedCharDeviceClient, 1);
 dev_client->client = client;
 dev_client->send_queue = g_queue_new();
 dev_client->max_send_queue_size = max_send_queue_size;
-- 
2.13.5

___
Spice-devel mailing list
Spice-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/spice-devel