From 8bde6369f06e30d06e84491af983b77062e355ad Mon Sep 17 00:00:00 2001 From: Tomas Bzatek Date: Sun, 12 Dec 2010 11:24:13 +0100 Subject: jpeg-utils: Function data cleanup --- src/jpeg-utils.cpp | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'src/jpeg-utils.cpp') diff --git a/src/jpeg-utils.cpp b/src/jpeg-utils.cpp index 3ec547c..330b597 100644 --- a/src/jpeg-utils.cpp +++ b/src/jpeg-utils.cpp @@ -34,13 +34,12 @@ /* * get_exif: retrieve EXIF informations from a JPEG image */ -int -get_exif (const gchar *filename, TExifData **exif_data) +TExifData * +get_exif (const gchar *filename) { TExifData *data; data = (TExifData*) g_malloc0 (sizeof (TExifData)); - *exif_data = data; try { @@ -184,10 +183,11 @@ get_exif (const gchar *filename, TExifData **exif_data) catch (Exiv2::AnyError& e) { log_error ("get_exif: Caught Exiv2 exception: '%s'\n", e.what()); - return -1; + free_exif_data (data); + return NULL; } - return 0; + return data; } /* @@ -221,7 +221,6 @@ free_exif_data (TExifData *data) g_free (data->jpeg_comment); g_free (data); - data = NULL; } } -- cgit v1.2.3