[gthumb] Rework video tag reading slightly to placate cppcheck

[Michael J. Chudobiak <mjc src gnome org>]

commit e9fa0c930e1ff16149080b771d5d95df323f89af
Author: Michael J. Chudobiak <mjc avtechpulse com>
Date:   Wed May 20 08:14:52 2009 -0400

    Rework video tag reading slightly to placate cppcheck
---
 libgthumb/gth-gstreamer-utils.c |   67 ++++++++++----------------------------
 1 files changed, 18 insertions(+), 49 deletions(-)

diff --git a/libgthumb/gth-gstreamer-utils.c b/libgthumb/gth-gstreamer-utils.c
index 3ec2e26..743f0be 100644
--- a/libgthumb/gth-gstreamer-utils.c
+++ b/libgthumb/gth-gstreamer-utils.c
@@ -244,26 +244,20 @@ get_media_duration (MetadataExtractor *extractor)
 
 void tag_iterate (const GstTagList *list, const gchar *tag, GList **metadata)
 {
-	GType  tag_type;
-	char  *tag_name;
-
+	GType tag_type;
 	tag_type = gst_tag_get_type (tag);
-	tag_name = g_strdup (gst_tag_get_nick (tag));
-
 
 	/* ----- G_TYPE_BOOLEAN ----- */
 	if (tag_type == G_TYPE_BOOLEAN) {
 		gboolean ret;
 		if (gst_tag_list_get_boolean (list, tag, &ret)) {
 			if (ret) {
-				*metadata = add_metadata (*metadata, tag_name, g_strdup ("TRUE"));
+				*metadata = add_metadata (*metadata, g_strdup (gst_tag_get_nick (tag)), g_strdup ("TRUE"));
 			} 
 			else {
-				*metadata = add_metadata (*metadata, tag_name, g_strdup ("FALSE"));
+				*metadata = add_metadata (*metadata, g_strdup (gst_tag_get_nick (tag)), g_strdup ("FALSE"));
 			}			
 		}
-		else
-			g_free (tag_name);
 	}
 
 
@@ -271,9 +265,7 @@ void tag_iterate (const GstTagList *list, const gchar *tag, GList **metadata)
 	if (tag_type == G_TYPE_STRING) {
 		char *ret = NULL;
 		if (gst_tag_list_get_string (list, tag, &ret))
-			*metadata = add_metadata (*metadata, tag_name, ret);
-		else
-			g_free (tag_name);
+			*metadata = add_metadata (*metadata, g_strdup (gst_tag_get_nick (tag)), ret);
 	}
 
 
@@ -281,9 +273,7 @@ void tag_iterate (const GstTagList *list, const gchar *tag, GList **metadata)
         if (tag_type == G_TYPE_UCHAR) {
                 guchar ret = 0;
                 if (gst_tag_list_get_uchar (list, tag, &ret))
-                        *metadata = add_metadata (*metadata, tag_name, g_strdup_printf ("%u", ret));
-                else
-                        g_free (tag_name);
+                        *metadata = add_metadata (*metadata, g_strdup (gst_tag_get_nick (tag)), g_strdup_printf ("%u", ret));
         }
 
 
@@ -291,9 +281,7 @@ void tag_iterate (const GstTagList *list, const gchar *tag, GList **metadata)
         if (tag_type == G_TYPE_CHAR) {
                 gchar ret = 0;
                 if (gst_tag_list_get_char (list, tag, &ret))
-                        *metadata = add_metadata (*metadata, tag_name, g_strdup_printf ("%d", ret));
-                else
-                        g_free (tag_name);
+                        *metadata = add_metadata (*metadata, g_strdup (gst_tag_get_nick (tag)), g_strdup_printf ("%d", ret));
         }
 
 
@@ -301,9 +289,7 @@ void tag_iterate (const GstTagList *list, const gchar *tag, GList **metadata)
         if (tag_type == G_TYPE_UINT) {
                 guint ret = 0;
                 if (gst_tag_list_get_uint (list, tag, &ret))
-                        *metadata = add_metadata (*metadata, tag_name, g_strdup_printf ("%u", ret));
-                else
-                        g_free (tag_name);
+                        *metadata = add_metadata (*metadata, g_strdup (gst_tag_get_nick (tag)), g_strdup_printf ("%u", ret));
         }
 
 
@@ -311,9 +297,7 @@ void tag_iterate (const GstTagList *list, const gchar *tag, GList **metadata)
         if (tag_type == G_TYPE_INT) {
                 gint ret = 0;
                 if (gst_tag_list_get_int (list, tag, &ret))
-                        *metadata = add_metadata (*metadata, tag_name, g_strdup_printf ("%d", ret));
-                else
-                        g_free (tag_name);
+                        *metadata = add_metadata (*metadata, g_strdup (gst_tag_get_nick (tag)), g_strdup_printf ("%d", ret));
         }
 
 
@@ -321,9 +305,7 @@ void tag_iterate (const GstTagList *list, const gchar *tag, GList **metadata)
         if (tag_type == G_TYPE_ULONG) {
                 gulong ret = 0;
                 if (gst_tag_list_get_ulong (list, tag, &ret))
-                        *metadata = add_metadata (*metadata, tag_name, g_strdup_printf ("%lu", ret));
-                else
-                        g_free (tag_name);
+                        *metadata = add_metadata (*metadata, g_strdup (gst_tag_get_nick (tag)), g_strdup_printf ("%lu", ret));
         }
 
 
@@ -331,9 +313,7 @@ void tag_iterate (const GstTagList *list, const gchar *tag, GList **metadata)
         if (tag_type == G_TYPE_LONG) {
                 glong ret = 0;
                 if (gst_tag_list_get_long (list, tag, &ret))
-                        *metadata = add_metadata (*metadata, tag_name, g_strdup_printf ("%ld", ret));
-                else
-                        g_free (tag_name);
+                        *metadata = add_metadata (*metadata, g_strdup (gst_tag_get_nick (tag)), g_strdup_printf ("%ld", ret));
         }
 
 
@@ -341,9 +321,7 @@ void tag_iterate (const GstTagList *list, const gchar *tag, GList **metadata)
         if (tag_type == G_TYPE_INT64) {
                 gint64 ret = 0;
                 if (gst_tag_list_get_int64 (list, tag, &ret))
-                        *metadata = add_metadata (*metadata, tag_name, g_strdup_printf ("%" G_GINT64_FORMAT, ret));
-                else
-                        g_free (tag_name);
+                        *metadata = add_metadata (*metadata, g_strdup (gst_tag_get_nick (tag)), g_strdup_printf ("%" G_GINT64_FORMAT, ret));
         }
 
 
@@ -351,9 +329,7 @@ void tag_iterate (const GstTagList *list, const gchar *tag, GList **metadata)
         if (tag_type == G_TYPE_UINT64) {
                 guint64 ret = 0;
                 if (gst_tag_list_get_uint64 (list, tag, &ret))
-                        *metadata = add_metadata (*metadata, tag_name, g_strdup_printf ("%" G_GUINT64_FORMAT, ret));
-                else
-                        g_free (tag_name);
+                        *metadata = add_metadata (*metadata, g_strdup (gst_tag_get_nick (tag)), g_strdup_printf ("%" G_GUINT64_FORMAT, ret));
         }
 
 
@@ -361,9 +337,7 @@ void tag_iterate (const GstTagList *list, const gchar *tag, GList **metadata)
         if (tag_type == G_TYPE_DOUBLE) {
                 gdouble ret = 0;
                 if (gst_tag_list_get_double (list, tag, &ret))
-                        *metadata = add_metadata (*metadata, tag_name, g_strdup_printf ("%f", ret));
-                else
-                        g_free (tag_name);
+                        *metadata = add_metadata (*metadata, g_strdup (gst_tag_get_nick (tag)), g_strdup_printf ("%f", ret));
         }
 
 
@@ -371,9 +345,7 @@ void tag_iterate (const GstTagList *list, const gchar *tag, GList **metadata)
         if (tag_type == G_TYPE_FLOAT) {
                 gfloat ret = 0;
                 if (gst_tag_list_get_float (list, tag, &ret))
-                        *metadata = add_metadata (*metadata, tag_name, g_strdup_printf ("%f", ret));
-                else
-                        g_free (tag_name);
+                        *metadata = add_metadata (*metadata, g_strdup (gst_tag_get_nick (tag)), g_strdup_printf ("%f", ret));
         }
 
 
@@ -384,14 +356,11 @@ void tag_iterate (const GstTagList *list, const gchar *tag, GList **metadata)
 			if (ret) {
 				gchar buf[11];
 				g_date_strftime (buf, 10, "%F", ret);
-				*metadata = add_metadata (*metadata, tag_name, g_strdup (buf));
-				}
-			g_free (ret);
+				*metadata = add_metadata (*metadata, g_strdup (gst_tag_get_nick (tag)), g_strdup (buf));
 			}
-                else
-                        g_free (tag_name);
-        }
-	
+			g_free (ret);
+		}
+        }	
 }