From 7a759dc2cae9da9d0a5882c2b4c4dc0428c96e3c Mon Sep 17 00:00:00 2001 From: Christophe Fergeau Date: Sun, 6 Jul 2008 14:04:05 +0000 Subject: Remove non-useful argument to db_parse_context_destroy (patch from songbird) git-svn-id: https://gtkpod.svn.sf.net/svnroot/gtkpod/libgpod/trunk@2038 f01d2545-417e-4e96-918e-98f8d0dbbcb6 --- ChangeLog | 9 +++++++++ src/db-artwork-parser.c | 6 +++--- src/db-parse-context.c | 4 ++-- src/db-parse-context.h | 2 +- 4 files changed, 15 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index fc7e6fe..bfc9b95 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2008-07-06 Christophe Fergeau + + * src/db-artwork-parser.c + * src/db-parse-context.c + * src/db-parse-context.h: get rid of unused argument to + db_parse_context_destroy (it was always set to TRUE) + 2008-07-06 Christophe Fergeau * src/ithumb-writer.c: fix bug in the function scaling and cropping @@ -20,6 +27,8 @@ 2008-07-05 Christophe Fergeau + Patch from: Songbird (http://getsongbird.com/) + * src/ithumb-writer.c: don't leak the list of image formats we get from the ItdbDevice diff --git a/src/db-artwork-parser.c b/src/db-artwork-parser.c index 4d9aad7..62cf4a1 100644 --- a/src/db-artwork-parser.c +++ b/src/db-artwork-parser.c @@ -706,12 +706,12 @@ ipod_parse_artwork_db (Itdb_iTunesDB *itdb) } parse_mhfd (ctx, NULL); - db_parse_context_destroy (ctx, TRUE); + db_parse_context_destroy (ctx); return 0; error: if (ctx != NULL) { - db_parse_context_destroy (ctx, TRUE); + db_parse_context_destroy (ctx); } return -1; } @@ -779,7 +779,7 @@ ipod_parse_photo_db (Itdb_PhotoDB *photodb) return -1; } parse_mhfd (ctx, NULL); - db_parse_context_destroy (ctx, TRUE); + db_parse_context_destroy (ctx); /* Now we need to replace references to artwork_ids in the * photo albums with references to the actual artwork diff --git a/src/db-parse-context.c b/src/db-parse-context.c index 57d913a..1388626 100644 --- a/src/db-parse-context.c +++ b/src/db-parse-context.c @@ -59,11 +59,11 @@ db_parse_context_new (const unsigned char *buffer, off_t len, guint byte_order) } void -db_parse_context_destroy (DBParseContext *ctx, gboolean unmap) +db_parse_context_destroy (DBParseContext *ctx) { g_return_if_fail (ctx != NULL); - if (unmap) { + if (ctx->buffer != NULL) { munmap ((void*)ctx->buffer, ctx->total_len); } g_free (ctx); diff --git a/src/db-parse-context.h b/src/db-parse-context.h index 85f40ae..5703ac5 100644 --- a/src/db-parse-context.h +++ b/src/db-parse-context.h @@ -74,6 +74,6 @@ db_parse_context_new_from_file (const char *filename, Itdb_DB *db); G_GNUC_INTERNAL void -db_parse_context_destroy (DBParseContext *ctx, gboolean unmap); +db_parse_context_destroy (DBParseContext *ctx); #endif -- cgit