From Jakub Zawadzki (bug 3331):

g_free() is NULL safe, so we don't need check against it.


git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@27718 f5534014-38df-0310-8fa8-9805f1628bb7

28 files changed, 68 insertions, 139 deletions

diff --git a/gtk/capture_dlg.c b/gtk/capture_dlg.c
index f527a42967..95cdd88058 100644
--- a/gtk/capture_dlg.c
+++ b/gtk/capture_dlg.c
@@ -2608,10 +2608,8 @@ capture_dlg_prep(gpointer parent_w) {
     g_free(entry_text);
     return FALSE;
   }
-  if (global_capture_opts.iface)
-    g_free(global_capture_opts.iface);
-  if (global_capture_opts.iface_descr)
-    g_free(global_capture_opts.iface_descr);
+  g_free(global_capture_opts.iface);
+  g_free(global_capture_opts.iface_descr);
   global_capture_opts.iface = g_strdup(if_name);
   global_capture_opts.iface_descr = get_interface_descriptive_name(global_capture_opts.iface);
   g_free(entry_text);
diff --git a/gtk/capture_if_dlg.c b/gtk/capture_if_dlg.c
index 20decfe80b..aa5bf3a063 100644
--- a/gtk/capture_if_dlg.c
+++ b/gtk/capture_if_dlg.c
@@ -152,10 +152,8 @@ capture_do_cb(GtkWidget *capture_bt _U_, gpointer if_data)
   airpcap_if_selected = airpcap_if_active;
 #endif
 
-  if (global_capture_opts.iface)
-    g_free(global_capture_opts.iface);
-  if (global_capture_opts.iface_descr)
-    g_free(global_capture_opts.iface_descr);
+  g_free(global_capture_opts.iface);
+  g_free(global_capture_opts.iface_descr);
 
   global_capture_opts.iface = g_strdup(if_dlg_data->device);
   global_capture_opts.iface_descr = get_interface_descriptive_name(global_capture_opts.iface);
@@ -179,10 +177,8 @@ capture_prepare_cb(GtkWidget *prepare_bt _U_, gpointer if_data)
 {
   if_dlg_data_t *if_dlg_data = if_data;
 
-  if (global_capture_opts.iface)
-    g_free(global_capture_opts.iface);
-  if (global_capture_opts.iface_descr)
-    g_free(global_capture_opts.iface_descr);
+  g_free(global_capture_opts.iface);
+  g_free(global_capture_opts.iface_descr);
 
   global_capture_opts.iface = g_strdup(if_dlg_data->device);
   global_capture_opts.iface_descr = get_interface_descriptive_name(global_capture_opts.iface);
diff --git a/gtk/color_edit_dlg.c b/gtk/color_edit_dlg.c
index 5f2bc1faa7..7146f35114 100644
--- a/gtk/color_edit_dlg.c
+++ b/gtk/color_edit_dlg.c
@@ -405,12 +405,12 @@ edit_color_filter_ok_cb                (GtkButton       *button,
         color_filters = (GtkWidget *)g_object_get_data(G_OBJECT(button), COLOR_FILTERS_CL);
         colorf = (color_filter_t *)g_object_get_data(G_OBJECT(button), COLOR_FILTER);
 
-        if (colorf->filter_name != NULL)
-            g_free(colorf->filter_name);
+        g_free(colorf->filter_name);
         colorf->filter_name = filter_name;
-        if (colorf->filter_text != NULL)
-            g_free(colorf->filter_text);
+
+        g_free(colorf->filter_text);
         colorf->filter_text = filter_text;
+
 	colorf->disabled = filter_disabled;
         gdkcolor_to_color_t(&colorf->fg_color, &new_fg_color);
         gdkcolor_to_color_t(&colorf->bg_color, &new_bg_color);
diff --git a/gtk/decode_as_ber.c b/gtk/decode_as_ber.c
index 3e5020674d..789e36a7d0 100644
--- a/gtk/decode_as_ber.c
+++ b/gtk/decode_as_ber.c
@@ -84,8 +84,7 @@ decode_ber(GtkWidget *notebook_pg)
     } else {
       ber_decode_as(syntax);
     }
-    if (syntax != NULL)
-	g_free(syntax);
+    g_free(syntax);
 }
 
 
diff --git a/gtk/decode_as_dcerpc.c b/gtk/decode_as_dcerpc.c
index e609af864c..7592fa1e48 100644
--- a/gtk/decode_as_dcerpc.c
+++ b/gtk/decode_as_dcerpc.c
@@ -267,8 +267,7 @@ decode_change_one_dcerpc_binding(const gchar *table_name, decode_dcerpc_bind_val
 			binding->ver = key->ver;
 			decode_dcerpc_binding_change(table_name, binding);
     }
-    if (abbrev != NULL)
-	g_free(abbrev);
+    g_free(abbrev);
 }
 
 
diff --git a/gtk/decode_as_dlg.c b/gtk/decode_as_dlg.c
index edb25a96f6..0c016d6dec 100644
--- a/gtk/decode_as_dlg.c
+++ b/gtk/decode_as_dlg.c
@@ -652,8 +652,7 @@ decode_change_one_dissector(gchar *table_name, guint selector, GtkWidget *list)
     } else {
 	dissector_change(table_name, selector, handle);
     }
-    if (abbrev != NULL)
-	g_free(abbrev);
+    g_free(abbrev);
 }
 
 
diff --git a/gtk/dfilter_expr_dlg.c b/gtk/dfilter_expr_dlg.c
index 7c68620f08..3d8c7c4ea1 100644
--- a/gtk/dfilter_expr_dlg.c
+++ b/gtk/dfilter_expr_dlg.c
@@ -733,8 +733,7 @@ dfilter_expr_dlg_accept_cb(GtkWidget *w, gpointer filter_te_arg)
                           "Ranges of that field can't be tested with \"%s\".",
                           item_str);
         }
-        if (range_str != NULL)
-            g_free(range_str);
+        g_free(range_str);
         return;
     }
 
@@ -753,8 +752,7 @@ dfilter_expr_dlg_accept_cb(GtkWidget *w, gpointer filter_te_arg)
                           "That field must be compared with a value, "
                           "but you didn't specify a value with which to "
                           "compare it.");
-            if (range_str != NULL)
-                g_free(range_str);
+            g_free(range_str);
             g_free(value_str);
             return;
         }
@@ -781,8 +779,7 @@ dfilter_expr_dlg_accept_cb(GtkWidget *w, gpointer filter_te_arg)
              * The dialog box was already popped up by
              * "dfilter_report_bad_value()".
              */
-            if (range_str != NULL)
-                g_free(range_str);
+            g_free(range_str);
             g_free(value_str);
             return;
         }
diff --git a/gtk/file_dlg.c b/gtk/file_dlg.c
index cd5339cd5a..1e92acb3d4 100644
--- a/gtk/file_dlg.c
+++ b/gtk/file_dlg.c
@@ -247,9 +247,7 @@ set_last_open_dir(char *dirname)
 			updated_last_open_dir = TRUE;
 	}
 
-	if (last_open_dir) {
-		g_free(last_open_dir);
-	}
+	g_free(last_open_dir);
 	last_open_dir = new_last_open_dir;
 }
 
diff --git a/gtk/filter_autocomplete.c b/gtk/filter_autocomplete.c
index 8e94789b9b..08b1c89f41 100644
--- a/gtk/filter_autocomplete.c
+++ b/gtk/filter_autocomplete.c
@@ -310,8 +310,7 @@ autocompletion_list_lookup(GtkWidget *filter_te, GtkWidget *popup_win, GtkWidget
       return FALSE;
     }
 
-    if (first)
-      g_free (first);
+    g_free (first);
 
     gtk_widget_size_request(list, &requisition);
 
@@ -417,11 +416,8 @@ filter_string_te_key_pressed_cb(GtkWidget *filter_te, GdkEventKey *event)
       popup_win = filter_autocomplete_new(filter_te, name_with_period, FALSE, &stop_propagation);
       g_object_set_data(G_OBJECT(w_toplevel), E_FILT_AUTOCOMP_PTR_KEY, popup_win);
 
-      if(name_with_period)
-        g_free (name_with_period);
-
-      if(prefix_start)
-        g_free(prefix_start);
+      g_free(name_with_period);
+      g_free(prefix_start);
 
       return stop_propagation;
     }
@@ -439,8 +435,7 @@ filter_string_te_key_pressed_cb(GtkWidget *filter_te, GdkEventKey *event)
       }
     }
 
-    if(prefix_start)
-      g_free(prefix_start);
+    g_free(prefix_start);
 
     return FALSE;
   } else if(g_ascii_isalnum(ckey) && !popup_win) {
@@ -451,19 +446,15 @@ filter_string_te_key_pressed_cb(GtkWidget *filter_te, GdkEventKey *event)
       g_object_set_data(G_OBJECT(w_toplevel), E_FILT_AUTOCOMP_PTR_KEY, popup_win);
     }
 
-    if (name)
-      g_free (name);
-
-    if(prefix_start)
-      g_free(prefix_start);
+    g_free(name);
+    g_free(prefix_start);
 
     return stop_propagation;
   }
 
   /* If the popup window hasn't been constructed yet then we have nothing to do */
   if( !popup_win ) {
-    if(prefix_start)
-      g_free(prefix_start);
+    g_free(prefix_start);
 
     return FALSE;
   }
@@ -508,8 +499,7 @@ filter_string_te_key_pressed_cb(GtkWidget *filter_te, GdkEventKey *event)
         gtk_tree_path_free(path);
       }
 
-      if(prefix_start)
-        g_free(prefix_start);
+      g_free(prefix_start);
 
       /* stop event propagation */
       return TRUE;
@@ -549,8 +539,7 @@ filter_string_te_key_pressed_cb(GtkWidget *filter_te, GdkEventKey *event)
         gtk_tree_path_free(path);
       }
 
-      if(prefix_start)
-        g_free(prefix_start);
+      g_free(prefix_start);
 
       /* stop event propagation */
       return TRUE;
@@ -595,15 +584,12 @@ filter_string_te_key_pressed_cb(GtkWidget *filter_te, GdkEventKey *event)
         g_object_set_data(G_OBJECT(w_toplevel), E_FILT_AUTOCOMP_PTR_KEY, NULL);
       }
 
-      if(updated_str)
-        g_free(updated_str);
+      g_free(updated_str);
     }
 
   }
 
-
-  if(prefix_start)
-    g_free(prefix_start);
+  g_free(prefix_start);
 
   if(k == GDK_Return || k == GDK_KP_Enter)
     return TRUE;    /* stop event propagation */
diff --git a/gtk/filter_dlg.c b/gtk/filter_dlg.c
index 16262b6614..1a4b24d07e 100644
--- a/gtk/filter_dlg.c
+++ b/gtk/filter_dlg.c
@@ -1025,10 +1025,8 @@ filter_sel_list_cb(GtkTreeSelection *sel, gpointer data _U_)
         gtk_widget_set_sensitive(copy_bt, sensitivity);
     if (del_bt != NULL)
         gtk_widget_set_sensitive(del_bt, sensitivity);
-    if (name != NULL)
-        g_free(name);
-    if (strval != NULL)
-        g_free(strval);
+    g_free(name);
+    g_free(strval);
 }
 
 /* To do: add input checking to each of these callbacks */
diff --git a/gtk/filter_utils.c b/gtk/filter_utils.c
index 18bf161743..a41fe657bf 100644
--- a/gtk/filter_utils.c
+++ b/gtk/filter_utils.c
@@ -103,8 +103,5 @@ apply_selected_filter (guint callback_action, char *filter)
 		color_display_with_filter(str);
 		break;
 	}
-
-	if (str) {
-		g_free (str);
-	}
+	g_free (str);
 }
diff --git a/gtk/find_dlg.c b/gtk/find_dlg.c
index 2cf218581c..59dcff6cc5 100644
--- a/gtk/find_dlg.c
+++ b/gtk/find_dlg.c
@@ -647,8 +647,7 @@ find_frame_ok_cb(GtkWidget *ok_bt _U_, gpointer parent_w)
   /*
    * Remember the search parameters.
    */
-  if (cfile.sfilter)
-    g_free(cfile.sfilter);
+  g_free(cfile.sfilter);
   cfile.sfilter = g_strdup(filter_text);
   cfile.sbackward = GTK_TOGGLE_BUTTON (up_rb)->active;
   cfile.hex = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON (hex_rb));
diff --git a/gtk/flow_graph.c b/gtk/flow_graph.c
index c070d80b29..745b6debe0 100644
--- a/gtk/flow_graph.c
+++ b/gtk/flow_graph.c
@@ -249,13 +249,10 @@ static int flow_graph_frame_add_to_graph(packet_info *pinfo)
 	gai->comment=NULL;
 	gai->frame_label=NULL;
 
-	if (gai->comment!=NULL){
-		g_free(gai->comment);
-	}
-	if (gai->frame_label!=NULL){
-		g_free(gai->frame_label);
-	}
-
+	/* this code doesn't make sense.
+	g_free(gai->comment);
+	g_free(gai->frame_label);
+	*/
 
 	if(pinfo->cinfo) {
 		if (pinfo->cinfo->col_first[COL_INFO]>=0){
@@ -263,6 +260,7 @@ static int flow_graph_frame_add_to_graph(packet_info *pinfo)
 			for (i = pinfo->cinfo->col_first[COL_INFO]; i <= pinfo->cinfo->col_last[COL_INFO]; i++) {
 				if (pinfo->cinfo->fmt_matx[i][COL_INFO]) {
 					colinfo = g_strdup(pinfo->cinfo->col_data[i]);
+					/* break; ? or g_free(colinfo); before g_strdup() */
 				}
 			}
 		}
@@ -272,7 +270,7 @@ static int flow_graph_frame_add_to_graph(packet_info *pinfo)
 			for (i = pinfo->cinfo->col_first[COL_PROTOCOL]; i <= pinfo->cinfo->col_last[COL_PROTOCOL]; i++) {
 				if (pinfo->cinfo->fmt_matx[i][COL_PROTOCOL]) {
 					protocol = g_strdup(pinfo->cinfo->col_data[i]);
-
+					/* break; ? or g_free(protocol); before g_strdup() */
 				}
 			}
 		}
@@ -291,18 +289,11 @@ static int flow_graph_frame_add_to_graph(packet_info *pinfo)
 		if (protocol != NULL) {
 			gai->frame_label = g_strdup_printf("%.19s", protocol);
 			gai->comment = g_strdup_printf("%s", protocol);
-		} else {
-			gai->frame_label = NULL;
-			gai->comment = NULL;
 		}
 	}
 
-	if (protocol!=NULL){
-		g_free(protocol);
-	}
-	if (colinfo!=NULL){
-		g_free(colinfo);
-	}
+	g_free(protocol);
+	g_free(colinfo);
 
 	gai->line_style=1;
 	gai->conv_num=0;
diff --git a/gtk/gtkvumeter.c b/gtk/gtkvumeter.c
index 05b8f7f571..3f84f6acd3 100644
--- a/gtk/gtkvumeter.c
+++ b/gtk/gtkvumeter.c
@@ -692,9 +692,7 @@ void gtk_vumeter_free_scale_items(GList *scale_items)
     for (current = scale_items; current != NULL; current = g_list_next(current)) {
         GtkVUMeterScaleItem * item = current->data;
 
-        if(item->label != NULL) {
-            g_free((void *) item->label);
-        }
+        g_free((void *) item->label);
         g_free(item);
     }
 
diff --git a/gtk/gui_utils.c b/gtk/gui_utils.c
index 4c3924387a..b991c036bd 100644
--- a/gtk/gui_utils.c
+++ b/gtk/gui_utils.c
@@ -537,8 +537,7 @@ set_main_window_name(const gchar *window_name)
 
   /* Attach the new un-decorated window name to the window. */
   old_window_name = g_object_get_data(G_OBJECT(top_level), MAIN_WINDOW_NAME_KEY);
-  if (old_window_name != NULL)
-    g_free(old_window_name);
+  g_free(old_window_name);
   g_object_set_data(G_OBJECT(top_level), MAIN_WINDOW_NAME_KEY, g_strdup(window_name));
 
   update_main_window_name();
diff --git a/gtk/io_stat.c b/gtk/io_stat.c
index d2fd824a7e..c4ba37026b 100644
--- a/gtk/io_stat.c
+++ b/gtk/io_stat.c
@@ -2039,9 +2039,7 @@ create_filter_box(io_stat_graph_t *gio, GtkWidget *box, int num)
 	gio->filter_bt=gtk_button_new_from_stock(WIRESHARK_STOCK_DISPLAY_FILTER_ENTRY);
 
 	g_snprintf(str, 256, "Wireshark: Display Filter  IO-Stat (Filter:%d)", num);
-	if(gio->args->title){
-		g_free( (gpointer) (gio->args->title) );
-	}
+	g_free( (gpointer) (gio->args->title) );
 	gio->args->title=g_strdup(str);
 
 	g_signal_connect(gio->filter_bt, "clicked", G_CALLBACK(filter_button_clicked), gio);
diff --git a/gtk/main.c b/gtk/main.c
index 88f7eb6eb2..2bde44d5ec 100644
--- a/gtk/main.c
+++ b/gtk/main.c
@@ -2210,8 +2210,7 @@ main(int argc, char *argv[])
 #endif
         break;
       case 'm':        /* Fixed-width font for the display */
-        if (prefs->gui_font_name != NULL)
-          g_free(prefs->gui_font_name);
+        g_free(prefs->gui_font_name);
         prefs->gui_font_name = g_strdup(optarg);
         break;
       case 'n':        /* No name resolution */
diff --git a/gtk/main_menu.c b/gtk/main_menu.c
index 203eccd32c..a091077a73 100644
--- a/gtk/main_menu.c
+++ b/gtk/main_menu.c
@@ -3110,9 +3110,7 @@ set_menus_for_selected_tree_row(capture_file *cf)
 	  rebuild_protocol_prefs_menu (prefs, properties);
 
 	  g_object_set_data(G_OBJECT(tree_view_menu_factory), "menu_abbrev", g_strdup(abbrev));
-	  if (prev_abbrev) {
-	    g_free (prev_abbrev);
-	  }
+	  g_free (prev_abbrev);
 	}
   } else {
 	set_menu_sensitivity(main_menu_factory,
diff --git a/gtk/main_welcome.c b/gtk/main_welcome.c
index 1f4fce898e..d7f6e049ff 100644
--- a/gtk/main_welcome.c
+++ b/gtk/main_welcome.c
@@ -475,10 +475,8 @@ main_welcome_add_recent_capture_files(const char *widget_cf_name)
 static gboolean
 welcome_if_press_cb(GtkWidget *widget _U_, GdkEvent *event _U_, gpointer data)
 {
-    if (global_capture_opts.iface)
-        g_free(global_capture_opts.iface);
-    if (global_capture_opts.iface_descr)
-        g_free(global_capture_opts.iface_descr);
+    g_free(global_capture_opts.iface);
+    g_free(global_capture_opts.iface_descr);
 
     global_capture_opts.iface = g_strdup(data);
     global_capture_opts.iface_descr = NULL;
diff --git a/gtk/prefs_column.c b/gtk/prefs_column.c
index d8ea3de390..427708ad6e 100644
--- a/gtk/prefs_column.c
+++ b/gtk/prefs_column.c
@@ -351,9 +351,7 @@ column_list_delete_cb(GtkWidget *w _U_, gpointer data) {
         cfmt = (fmt_data *) clp->data;
         g_free(cfmt->title);
         g_free(cfmt->fmt);
-        if (cfmt->custom_field) {
-          g_free (cfmt->custom_field);
-        }
+        g_free(cfmt->custom_field);
         g_free(cfmt);
         prefs.col_list = g_list_remove_link(prefs.col_list, clp);
 
@@ -406,9 +404,7 @@ column_field_changed_cb(GtkEditable *te, gpointer data) {
         fmt = g_strdup_printf("%s (%s)", col_format_desc(cur_fmt), field);
         gtk_list_store_set(GTK_LIST_STORE(model), &iter, 1, fmt, -1);
 	g_free(fmt);
-        if (cfmt->custom_field) {
-          g_free(cfmt->custom_field);
-        }
+        g_free(cfmt->custom_field);
         cfmt->custom_field = field;
     }
     cfile.cinfo.columns_changed = TRUE;
diff --git a/gtk/prefs_dlg.c b/gtk/prefs_dlg.c
index 18199d03f4..f2de2e794b 100644
--- a/gtk/prefs_dlg.c
+++ b/gtk/prefs_dlg.c
@@ -212,8 +212,7 @@ pref_show(pref_t *pref, gpointer user_data)
     break;
 
   case PREF_STRING:
-    if (pref->saved_val.string != NULL)
-      g_free(pref->saved_val.string);
+    g_free(pref->saved_val.string);
     pref->saved_val.string = g_strdup(*pref->varp.string);
     pref->control = create_preference_entry(main_tb, pref->ordinal,
 					    label_string, pref->description,
@@ -224,8 +223,7 @@ pref_show(pref_t *pref, gpointer user_data)
   {
     char *range_string;
 
-    if (pref->saved_val.range != NULL)
-      g_free(pref->saved_val.range);
+    g_free(pref->saved_val.range);
     pref->saved_val.range = range_copy(*pref->varp.range);
     range_string = range_convert_range(*pref->varp.range);
     pref->control = create_preference_entry(main_tb, pref->ordinal,
diff --git a/gtk/prefs_gui.c b/gtk/prefs_gui.c
index 9f897bc3d2..054840146a 100644
--- a/gtk/prefs_gui.c
+++ b/gtk/prefs_gui.c
@@ -415,8 +415,7 @@ gui_prefs_fetch(GtkWidget *w)
 	prefs.gui_fileopen_style = fetch_preference_radio_buttons_val(
 	    g_object_get_data(G_OBJECT(w), GUI_FILEOPEN_KEY), gui_fileopen_vals);
 	
-	if (prefs.gui_fileopen_dir != NULL)
-		g_free(prefs.gui_fileopen_dir);
+	g_free(prefs.gui_fileopen_dir);
 	prefs.gui_fileopen_dir = g_strdup(gtk_entry_get_text(
                                               GTK_ENTRY(g_object_get_data(G_OBJECT(w), GUI_FILEOPEN_DIR_KEY))));
 
@@ -446,8 +445,7 @@ gui_prefs_fetch(GtkWidget *w)
 	if (font_fetch()) {
 		if (strcmp(new_font_name, prefs.gui_font_name) != 0) {
 			font_changed = TRUE;
-			if (prefs.gui_font_name != NULL)
-				g_free(prefs.gui_font_name);
+			g_free(prefs.gui_font_name);
 			prefs.gui_font_name = g_strdup(new_font_name);
 		}
 	}
diff --git a/gtk/prefs_layout.c b/gtk/prefs_layout.c
index c97a15552a..b7aa58317f 100644
--- a/gtk/prefs_layout.c
+++ b/gtk/prefs_layout.c
@@ -477,8 +477,7 @@ layout_prefs_fetch(GtkWidget *w)
     prefs.gui_toolbar_main_style = fetch_enum_value(
         g_object_get_data(G_OBJECT(w), GUI_TOOLBAR_STYLE_KEY), toolbar_style_vals);
 
-    if (prefs.gui_window_title != NULL)
-        g_free(prefs.gui_window_title);
+    g_free(prefs.gui_window_title);
     prefs.gui_window_title = g_strdup(gtk_entry_get_text(
                                           GTK_ENTRY(g_object_get_data(G_OBJECT(w), GUI_WINDOW_TITLE_KEY))));
 }
diff --git a/gtk/prefs_print.c b/gtk/prefs_print.c
index f5eb6ed12d..95753b5bbe 100644
--- a/gtk/prefs_print.c
+++ b/gtk/prefs_print.c
@@ -152,14 +152,12 @@ printer_prefs_fetch(GtkWidget *w)
       g_object_get_data(G_OBJECT(w), E_PRINT_DESTINATION_KEY), print_dest_vals);
 
 #ifndef _WIN32
-  if (prefs.pr_cmd)
-    g_free(prefs.pr_cmd);
+  g_free(prefs.pr_cmd);
   prefs.pr_cmd = g_strdup(gtk_entry_get_text(
                               GTK_ENTRY(g_object_get_data(G_OBJECT(w), PRINT_CMD_TE_KEY))));
 #endif
 
-  if (prefs.pr_file)
-    g_free(prefs.pr_file);
+  g_free(prefs.pr_file);
   prefs.pr_file = g_strdup(gtk_entry_get_text(
                                GTK_ENTRY(g_object_get_data(G_OBJECT(w), PRINT_FILE_TE_KEY))));
 }
diff --git a/gtk/profile_dlg.c b/gtk/profile_dlg.c
index ccfa7920a2..eeec1c00a5 100644
--- a/gtk/profile_dlg.c
+++ b/gtk/profile_dlg.c
@@ -322,9 +322,8 @@ profile_apply(GtkWidget *main_w, GtkTreeView *profile_l, gboolean destroy)
 	  g_free(pf_dir_path);
 	}
 	profile1->status = PROF_STAT_EXISTS;
-	if (profile1->reference) {
-	  g_free (profile1->reference);
-	}
+
+	g_free (profile1->reference);
 	profile1->reference = g_strdup(profile1->name);
       }
     } else if (profile1->status == PROF_STAT_CHANGED) {
@@ -506,8 +505,7 @@ profile_sel_list_cb(GtkTreeSelection *sel, gpointer data _U_)
     gtk_widget_set_sensitive(copy_bt, sensitivity);
   if (del_bt != NULL)
     gtk_widget_set_sensitive(del_bt, sensitivity);
-  if (name != NULL)
-    g_free(name);
+  g_free(name);
 }
 
 static void
diff --git a/gtk/recent.c b/gtk/recent.c
index 51642c8f5a..a57f0e06dc 100644
--- a/gtk/recent.c
+++ b/gtk/recent.c
@@ -120,9 +120,7 @@ free_col_width_info(recent_settings_t *rs)
 
   while (rs->col_width_list != NULL) {
     cfmt = rs->col_width_list->data;
-    if (cfmt->cfield) {
-      g_free(cfmt->cfield);
-    }
+    g_free(cfmt->cfield);
     g_free(cfmt);
     rs->col_width_list = g_list_remove_link(rs->col_width_list, rs->col_width_list);
   }
diff --git a/gtk/uat_gui.c b/gtk/uat_gui.c
index 2b7c7744dc..d8e45d7870 100644
--- a/gtk/uat_gui.c
+++ b/gtk/uat_gui.c
@@ -636,7 +636,7 @@ static gboolean uat_window_delete_event_cb(GtkWindow *w _U_, GdkEvent* e _U_, gp
 		gtk_widget_destroy(uat->rep->window);
 
 		uat->rep = NULL;
-		if (rep) g_free(rep);
+		g_free(rep);
 	}
 	return TRUE;
 }
diff --git a/gtk/voip_calls.c b/gtk/voip_calls.c
index b4012cbb11..a92763ca43 100644
--- a/gtk/voip_calls.c
+++ b/gtk/voip_calls.c
@@ -150,15 +150,12 @@ void voip_calls_reset(voip_calls_tapinfo_t *tapinfo)
 	while (list)
 	{
 		callsinfo = list->data;
-		if (callsinfo->call_id)
-			g_free(callsinfo->call_id);
+		g_free(callsinfo->call_id);
 		g_free(callsinfo->from_identity);
 		g_free(callsinfo->to_identity);
 		g_free((void *)(callsinfo->initial_speaker.data));
-		if (callsinfo->protocol_name)
-			g_free(callsinfo->protocol_name);
-		if (callsinfo->call_comment)
-			g_free(callsinfo->call_comment);
+		g_free(callsinfo->protocol_name);
+		g_free(callsinfo->call_comment);
 
 		if (callsinfo->free_prot_info && callsinfo->prot_info)
 			callsinfo->free_prot_info(callsinfo->prot_info);
@@ -864,7 +861,7 @@ static guint32 sdp_frame_num = 0;
 static void free_sip_info(gpointer p) {
 	sip_calls_info_t *si = p;
 
-	if (si->call_identifier) g_free(si->call_identifier);
+	g_free(si->call_identifier);
 	g_free(si);
 }
 
@@ -1705,7 +1702,7 @@ static void add_h245_Address(h323_calls_info_t *h323info,  h245_address_t *h245_
 static void free_h225_info(gpointer p) {
 	h323_calls_info_t *tmp_h323info = p;
 
-	if (tmp_h323info->guid) g_free(tmp_h323info->guid);
+	g_free(tmp_h323info->guid);
 
 	if (tmp_h323info->h245_list) {
 		GList *list2 = g_list_first(tmp_h323info->h245_list);
@@ -2948,12 +2945,12 @@ static int sccp_calls(packet_info *pinfo, const void *prot_info) {
 	} else {
 
 		if ( assoc->calling_party ) {
-			if (callsinfo->from_identity) g_free(callsinfo->from_identity );
+			g_free(callsinfo->from_identity);
 			callsinfo->from_identity =  g_strdup(assoc->calling_party);
 		}
 
 		if ( assoc->called_party ) {
-			if (callsinfo->to_identity) g_free(callsinfo->to_identity );
+			g_free(callsinfo->to_identity);
 			callsinfo->to_identity =  g_strdup(assoc->called_party);
 		}