diff options
| author | teuf <teuf@f01d2545-417e-4e96-918e-98f8d0dbbcb6> | 2008-07-06 14:04:05 +0000 |
|---|---|---|
| committer | teuf <teuf@f01d2545-417e-4e96-918e-98f8d0dbbcb6> | 2008-07-06 14:04:05 +0000 |
| commit | 1a7fad2d702323a23770493e29bf7fbdd1483f61 (patch) | |
| tree | e71c473e5b5889235e1bff80f5da352d9070027e | |
| parent | d12208b30fe99cd3ed1d6c4a5b8cddb9ad36653a (diff) | |
| download | libgpod-1a7fad2d702323a23770493e29bf7fbdd1483f61.tar.gz libgpod-1a7fad2d702323a23770493e29bf7fbdd1483f61.tar.xz libgpod-1a7fad2d702323a23770493e29bf7fbdd1483f61.zip | |
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
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | src/db-artwork-parser.c | 6 | ||||
| -rw-r--r-- | src/db-parse-context.c | 4 | ||||
| -rw-r--r-- | src/db-parse-context.h | 2 |
4 files changed, 15 insertions, 6 deletions
@@ -1,5 +1,12 @@ 2008-07-06 Christophe Fergeau <teuf@gnome.org> + * 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 <teuf@gnome.org> + * src/ithumb-writer.c: fix bug in the function scaling and cropping thumbnails, in the non-cropping case, the returned pixbuf size didn't reflect the size of the scaled pixbuf @@ -20,6 +27,8 @@ 2008-07-05 Christophe Fergeau <teuf@gnome.org> + 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 |