- coverity and unused vars

2 files changed, 39 insertions, 32 deletions

diff --git a/src/gns/gnunet-gns-gtk.c b/src/gns/gnunet-gns-gtk.c
index 995aa3f8..a6aca2d6 100644
--- a/src/gns/gnunet-gns-gtk.c
+++ b/src/gns/gnunet-gns-gtk.c
@@ -231,7 +231,6 @@ GNUNET_GNS_GTK_zone_open_dialog_response_cb (GtkDialog * dialog,
                                              gpointer user_data)
 {
   struct GNUNET_GNS_Context *gns = user_data;
-  GtkBuilder *builder = gns->builder;
   char *filename;
 
   if (GTK_RESPONSE_OK != response_id)
diff --git a/src/gns/gnunet-gns-gtk_zone.c b/src/gns/gnunet-gns-gtk_zone.c
index ca37784a..e17c8823 100644
--- a/src/gns/gnunet-gns-gtk_zone.c
+++ b/src/gns/gnunet-gns-gtk_zone.c
@@ -199,7 +199,11 @@ check_name_validity_and_commit (struct GNUNET_GNS_Context *gns, gchar *path)
     g_free (n_value);
     g_free (n_value_color);
 
-    gtk_tree_model_iter_next (gns->tm, &it);
+    if (FALSE == gtk_tree_model_iter_next (gns->tm, &it))
+    {
+      GNUNET_break (0);
+      break;
+    }
   }
 
   if (GNUNET_NO == valid)
@@ -574,7 +578,6 @@ GNUNET_GNS_GTK_expiration_cellrenderertext_edited_cb (GtkCellRendererText *rende
   GtkTreeIter it;
   struct GNUNET_TIME_Absolute abstime;
   gboolean is_rel;
-  char *time = new_text;
   char *old_text;
 
   if ((NULL != new_text))
@@ -589,7 +592,7 @@ GNUNET_GNS_GTK_expiration_cellrenderertext_edited_cb (GtkCellRendererText *rende
 
     if ((0 == strcmp(new_text,"")) || (0 == strcmp(new_text,EXPIRE_NEVER_STRING)))
     {
-      time = EXPIRE_NEVER_STRING;
+      new_text = EXPIRE_NEVER_STRING;
       abstime = GNUNET_TIME_absolute_get_forever();
     }
     else
@@ -812,26 +815,28 @@ void set_relative_expiration_time (struct GNUNET_GNS_Context *gns, struct GNUNET
   char *path;
   int not_dummy;
 
-  gtk_tree_selection_get_selected (ts, &tm, &it);
-  gtk_tree_model_get(tm, &it, TREE_COL_NOT_DUMMY_ROW, &not_dummy, -1);
-  if (GNUNET_NO == not_dummy)
-    return;
+  if (TRUE == gtk_tree_selection_get_selected (ts, &tm, &it))
+  {
+    gtk_tree_model_get(tm, &it, TREE_COL_NOT_DUMMY_ROW, &not_dummy, -1);
+    if (GNUNET_NO == not_dummy)
+      return;
 
-  /* Has parent? */
-  has_parent = gtk_tree_model_iter_parent (tm, &parent, &it);
+    /* Has parent? */
+    has_parent = gtk_tree_model_iter_parent (tm, &parent, &it);
 
-  if (FALSE == has_parent)
-    return;
+    if (FALSE == has_parent)
+      return;
 
-  abstime = GNUNET_TIME_absolute_add(GNUNET_TIME_absolute_get(), reltime);
+    abstime = GNUNET_TIME_absolute_add(GNUNET_TIME_absolute_get(), reltime);
 
-  /* this is a single record */
-  renderer = GTK_CELL_RENDERER_TEXT((gtk_builder_get_object (gns->builder, "GNUNET_GNS_GTK_name_cellrenderertext")));
-  path = gtk_tree_model_get_string_from_iter (tm, &it);
-  GNUNET_GNS_GTK_expiration_cellrenderertext_edited_cb (renderer,
-                                                        path,
-                                                        convert_time_to_string (abstime),
-                                                        gns);
+    /* this is a single record */
+    renderer = GTK_CELL_RENDERER_TEXT((gtk_builder_get_object (gns->builder, "GNUNET_GNS_GTK_name_cellrenderertext")));
+    path = gtk_tree_model_get_string_from_iter (tm, &it);
+    GNUNET_GNS_GTK_expiration_cellrenderertext_edited_cb (renderer,
+                                                          path,
+                                                          convert_time_to_string (abstime),
+                                                          gns);
+  }
 }
 
 
@@ -909,14 +914,17 @@ void GNUNET_GNS_GTK_delete_popup_menu_delete_cb (GtkMenuItem *menuitem,
   char *path;
 
   ts = gtk_tree_view_get_selection(gns->tv);
-  gtk_tree_selection_get_selected (ts, &tm, &it);
-  gtk_tree_model_get(tm, &it, TREE_COL_NOT_DUMMY_ROW, &not_dummy, -1);
-  if (GNUNET_NO == not_dummy)
-    return; /* do not delete the dummy line */
-
-  path = gtk_tree_model_get_string_from_iter (gns->tm, &it);
-  check_name_validity_and_remove(gns, path);
-  g_free (path);
+  if (TRUE == gtk_tree_selection_get_selected (ts, &tm, &it))
+  {
+    gtk_tree_selection_get_selected (ts, &tm, &it);
+    gtk_tree_model_get(tm, &it, TREE_COL_NOT_DUMMY_ROW, &not_dummy, -1);
+    if (GNUNET_NO == not_dummy)
+      return; /* do not delete the dummy line */
+
+    path = gtk_tree_model_get_string_from_iter (gns->tm, &it);
+    check_name_validity_and_remove(gns, path);
+    g_free (path);
+  }
 }
 
 void zone_iteration_proc (void *cls,
@@ -1014,11 +1022,11 @@ void zone_iteration_proc (void *cls,
                                             rd[c].data,
                                             rd[c].data_size);
     if (NULL == val)
-      GNUNET_asprintf(val, "%s", EXPIRE_INVALID_STRING);
+      GNUNET_asprintf(&val, "%s", EXPIRE_INVALID_STRING);
 
-    type_str = GNUNET_NAMESTORE_number_to_typename(rd[c].record_type);
+    type_str = strdup (GNUNET_NAMESTORE_number_to_typename(rd[c].record_type));
     if (NULL == type_str)
-      GNUNET_asprintf(type_str, "%s", EXPIRE_INVALID_STRING);
+      GNUNET_asprintf(&type_str, "%s", EXPIRE_INVALID_STRING);
 
     if (GNUNET_NAMESTORE_TYPE_PSEU == rd[c].record_type)
         zc_ctx->label = strdup(val);
@@ -1036,7 +1044,7 @@ void zone_iteration_proc (void *cls,
                                        TREE_COL_IS_RECORD_ROW, GNUNET_YES,
                                        TREE_COL_NOT_DUMMY_ROW, GNUNET_YES,
                                        -1);
-
+    GNUNET_free (type_str);
     GNUNET_free (exp);
     GNUNET_free (val);
   }