Patchwork [5/6] dmg: Use g_free instead of free

login
register
mail settings
Submitter Kevin Wolf
Date Jan. 24, 2013, 11:02 a.m.
Message ID <1359025358-5725-6-git-send-email-kwolf@redhat.com>
Download mbox | patch
Permalink /patch/215312/
State New
Headers show

Comments

Kevin Wolf - Jan. 24, 2013, 11:02 a.m.
The buffers are allocated with g_(re)alloc, so use g_free to free them.

Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
 block/dmg.c |   16 +++++++++-------
 1 files changed, 9 insertions(+), 7 deletions(-)
Markus Armbruster - Jan. 24, 2013, 1:44 p.m.
Kevin Wolf <kwolf@redhat.com> writes:

> The buffers are allocated with g_(re)alloc, so use g_free to free them.
>
> Signed-off-by: Kevin Wolf <kwolf@redhat.com>
> ---
>  block/dmg.c |   16 +++++++++-------
>  1 files changed, 9 insertions(+), 7 deletions(-)
>
> diff --git a/block/dmg.c b/block/dmg.c
> index d47d2d8..316d3c0 100644
> --- a/block/dmg.c
> +++ b/block/dmg.c
> @@ -366,15 +366,17 @@ static coroutine_fn int dmg_co_read(BlockDriverState *bs, int64_t sector_num,
>  static void dmg_close(BlockDriverState *bs)
>  {
>      BDRVDMGState *s = bs->opaque;
> +
>      if(s->n_chunks>0) {
> -	free(s->types);
> -	free(s->offsets);
> -	free(s->lengths);
> -	free(s->sectors);
> -	free(s->sectorcounts);
> +        g_free(s->types);
> +        g_free(s->offsets);
> +        g_free(s->lengths);
> +        g_free(s->sectors);
> +        g_free(s->sectorcounts);
>      }

Could we drop the if?

> -    free(s->compressed_chunk);
> -    free(s->uncompressed_chunk);
> +    g_free(s->compressed_chunk);
> +    g_free(s->uncompressed_chunk);
> +
>      inflateEnd(&s->zstream);
>  }

Patch

diff --git a/block/dmg.c b/block/dmg.c
index d47d2d8..316d3c0 100644
--- a/block/dmg.c
+++ b/block/dmg.c
@@ -366,15 +366,17 @@  static coroutine_fn int dmg_co_read(BlockDriverState *bs, int64_t sector_num,
 static void dmg_close(BlockDriverState *bs)
 {
     BDRVDMGState *s = bs->opaque;
+
     if(s->n_chunks>0) {
-	free(s->types);
-	free(s->offsets);
-	free(s->lengths);
-	free(s->sectors);
-	free(s->sectorcounts);
+        g_free(s->types);
+        g_free(s->offsets);
+        g_free(s->lengths);
+        g_free(s->sectors);
+        g_free(s->sectorcounts);
     }
-    free(s->compressed_chunk);
-    free(s->uncompressed_chunk);
+    g_free(s->compressed_chunk);
+    g_free(s->uncompressed_chunk);
+
     inflateEnd(&s->zstream);
 }