Remove unneeded initializations, and one redundant if condition.

svn path=/trunk/; revision=46702

17 files changed, 31 insertions, 31 deletions

diff --git a/ui/gtk/addr_resolution_dlg.c b/ui/gtk/addr_resolution_dlg.c
index 684520939f..39610baa4f 100644
--- a/ui/gtk/addr_resolution_dlg.c
+++ b/ui/gtk/addr_resolution_dlg.c
@@ -225,7 +225,7 @@ addr_resolution_dlg (GtkAction *action _U_, gpointer data _U_)
   GtkWidget *scroll;
   GtkWidget *bbox;
   GtkWidget *ok_bt, *cancel_bt, *help_bt;
-  GtkTextBuffer *buffer = NULL;
+  GtkTextBuffer *buffer;
 
   addr_resolution_dlg_w = dlg_window_new ("Address Resolution");
   gtk_widget_set_size_request (addr_resolution_dlg_w, 500, 160);
diff --git a/ui/gtk/capture_dlg.c b/ui/gtk/capture_dlg.c
index fb011e9a2b..ac6a8829cf 100644
--- a/ui/gtk/capture_dlg.c
+++ b/ui/gtk/capture_dlg.c
@@ -3505,13 +3505,13 @@ pipe_name_te_changed_cb(GtkWidget *w _U_, gpointer data _U_)
 {
   GtkWidget        *name_te = g_object_get_data(G_OBJECT(interface_management_w), E_CAP_PIPE_TE_KEY);
   GtkWidget        *pipe_l  = g_object_get_data(G_OBJECT(interface_management_w), E_CAP_PIPE_L_KEY);
-  const gchar      *name    = "";
+  const gchar      *name;
   GtkTreeSelection *sel;
   GtkTreeModel     *model;
   GtkTreeIter       iter;
 
-  sel = gtk_tree_view_get_selection(GTK_TREE_VIEW(pipe_l));
-  name   = gtk_entry_get_text(GTK_ENTRY(name_te));
+  sel  = gtk_tree_view_get_selection(GTK_TREE_VIEW(pipe_l));
+  name = gtk_entry_get_text(GTK_ENTRY(name_te));
 
   /* if something was selected */
   if (gtk_tree_selection_get_selected(sel, &model, &iter)) {
@@ -5620,9 +5620,9 @@ static void
 capture_prep_monitor_changed_cb(GtkWidget *monitor, gpointer argp _U_)
 {
   GList             *lt_entry;
-  gchar             *if_string          = "";
+  gchar             *if_string;
   gboolean           monitor_mode;
-  if_capabilities_t *caps               = NULL;
+  if_capabilities_t *caps;
   gint               linktype_count     = 0, i;
   data_link_info_t  *data_link_info;
   interface_t        device;
diff --git a/ui/gtk/decode_as_dlg.c b/ui/gtk/decode_as_dlg.c
index 12cd286138..338acabf83 100644
--- a/ui/gtk/decode_as_dlg.c
+++ b/ui/gtk/decode_as_dlg.c
@@ -1105,7 +1105,7 @@ decode_apply_cb (GtkWidget *apply_bt _U_, gpointer parent_w)
 static void
 decode_close_cb (GtkWidget *close_bt _U_, gpointer parent_w)
 {
-    GtkWidget *notebook_pg = NULL;
+    GtkWidget *notebook_pg;
     void *binding = NULL;
 
 
diff --git a/ui/gtk/edit_packet_comment_dlg.c b/ui/gtk/edit_packet_comment_dlg.c
index 040a0f239c..97f2f529f9 100644
--- a/ui/gtk/edit_packet_comment_dlg.c
+++ b/ui/gtk/edit_packet_comment_dlg.c
@@ -58,7 +58,7 @@ pkt_comment_text_buff_ok_cb(GtkWidget *w _U_, GtkWidget *view)
   GtkTextBuffer *buffer;
   GtkTextIter start_iter;
   GtkTextIter end_iter;
-  gchar *new_packet_comment = NULL;
+  gchar *new_packet_comment;
 
   buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (view));
   gtk_text_buffer_get_start_iter (buffer, &start_iter);
@@ -82,7 +82,7 @@ capture_comment_text_buff_ok_cb(GtkWidget *w _U_, GtkWidget *view)
   GtkTextBuffer *buffer;
   GtkTextIter start_iter;
   GtkTextIter end_iter;
-  gchar *new_capture_comment = NULL;
+  gchar *new_capture_comment;
 
   buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (view));
   gtk_text_buffer_get_start_iter (buffer, &start_iter);
@@ -131,7 +131,7 @@ edit_packet_comment_dlg (GtkAction *action _U_, gpointer data _U_)
   GtkWidget *scroll;
   GtkWidget *bbox;
   GtkWidget *ok_bt, *cancel_bt, *help_bt;
-  GtkTextBuffer *buffer = NULL;
+  GtkTextBuffer *buffer;
   gchar *opt_comment;
   gchar *buf_str;
 
@@ -199,7 +199,7 @@ show_packet_comment_summary_dlg (GtkAction *action _U_, gpointer data _U_)
   GtkWidget *scroll;
   GtkWidget *bbox;
   GtkWidget *copy_bt, *cancel_bt, *help_bt;
-  GtkTextBuffer *buffer = NULL;
+  GtkTextBuffer *buffer;
 
   view_capture_and_pkt_comments_dlg = dlg_window_new ("Comments Summary");
   gtk_widget_set_size_request (view_capture_and_pkt_comments_dlg, 700, 350);
diff --git a/ui/gtk/expert_comp_dlg.c b/ui/gtk/expert_comp_dlg.c
index 712b35616d..3bd28db3b8 100644
--- a/ui/gtk/expert_comp_dlg.c
+++ b/ui/gtk/expert_comp_dlg.c
@@ -300,7 +300,7 @@ error_packet(void *pss, packet_info *pinfo _U_, epan_dissect_t *edt _U_, const v
 static void
 expert_comp_draw(void *data)
 {
-    gchar *buf = NULL;
+    gchar *buf;
 
     expert_comp_dlg_t *ss=(expert_comp_dlg_t *)data;
 
diff --git a/ui/gtk/expert_comp_table.c b/ui/gtk/expert_comp_table.c
index 74c4931f49..372353609f 100644
--- a/ui/gtk/expert_comp_table.c
+++ b/ui/gtk/expert_comp_table.c
@@ -742,7 +742,7 @@ void
 init_error_table_row(error_equiv_table *err, const expert_info_t *expert_data)
 {
     guint old_num_procs=err->num_procs;
-    gint row=0;
+    gint row;
     error_procedure_t *procedure;
     GtkTreeStore *store;
     GtkTreeIter   new_iter;
diff --git a/ui/gtk/export_object_dlg.c b/ui/gtk/export_object_dlg.c
index 5e5177a880..6b49bbb943 100644
--- a/ui/gtk/export_object_dlg.c
+++ b/ui/gtk/export_object_dlg.c
@@ -137,7 +137,7 @@ eo_save_clicked_cb(GtkWidget *widget _U_, gpointer arg)
 {
 	GtkWidget *save_as_w;
 	export_object_list_t *object_list = arg;
-	export_object_entry_t *entry = NULL;
+	export_object_entry_t *entry;
 	gchar *filename = NULL;
 
 	entry = g_slist_nth_data(object_list->entries,
diff --git a/ui/gtk/font_utils.c b/ui/gtk/font_utils.c
index 0efeb001e9..c4964d37c5 100644
--- a/ui/gtk/font_utils.c
+++ b/ui/gtk/font_utils.c
@@ -327,7 +327,7 @@ static void try_to_get_windows_font_gtk2(void)
     fontspec = default_windows_menu_fontspec_gtk2();
 
     if (fontspec != NULL) {
-        int match = 0;
+        int match;
         PangoFontDescription *pfd;
         PangoFont *pfont;
         PangoContext *pc;
diff --git a/ui/gtk/main_menubar.c b/ui/gtk/main_menubar.c
index 085df3cfc6..9b206a448a 100644
--- a/ui/gtk/main_menubar.c
+++ b/ui/gtk/main_menubar.c
@@ -4436,7 +4436,7 @@ menu_recent_file_write_all(FILE *rf)
 void
 menu_name_resolution_changed(void)
 {
-    GtkWidget *menu = NULL;
+    GtkWidget *menu;
 
     menu = gtk_ui_manager_get_widget(ui_manager_main_menubar, "/Menubar/ViewMenu/NameResolution/EnableforMACLayer");
     if(!menu){
@@ -4528,7 +4528,7 @@ colorize_cb(GtkWidget *w, gpointer d _U_)
 void
 menu_recent_read_finished(void)
 {
-    GtkWidget *menu = NULL;
+    GtkWidget *menu;
 
     menu = gtk_ui_manager_get_widget(ui_manager_main_menubar, "/Menubar/ViewMenu/MainToolbar");
     if(!menu){
diff --git a/ui/gtk/main_welcome.c b/ui/gtk/main_welcome.c
index 176309795f..a4aced244d 100644
--- a/ui/gtk/main_welcome.c
+++ b/ui/gtk/main_welcome.c
@@ -917,7 +917,7 @@ static void
 update_capture_box(void)
 {
     guint               i;
-    GtkListStore        *store = NULL;
+    GtkListStore        *store;
     GtkTreeIter         iter;
     GtkTreeSelection    *entry;
     interface_t         device;
diff --git a/ui/gtk/mtp3_summary.c b/ui/gtk/mtp3_summary.c
index 2eac957311..33c06661b3 100644
--- a/ui/gtk/mtp3_summary.c
+++ b/ui/gtk/mtp3_summary.c
@@ -218,7 +218,7 @@ mtp3_sum_draw(
     int			i, j;
     int			num_msus;
     int			num_bytes;
-    GtkListStore *list_store = NULL;
+    GtkListStore *list_store;
     GtkTreeIter  iter;
 
     *tot_num_msus_p = 0;
diff --git a/ui/gtk/packet_list.c b/ui/gtk/packet_list.c
index 4f382ac7be..1c5b364415 100644
--- a/ui/gtk/packet_list.c
+++ b/ui/gtk/packet_list.c
@@ -1239,7 +1239,7 @@ packet_list_select_cb(GtkTreeView *tree_view, gpointer data _U_)
 
 	cf_select_packet(&cfile, row);
 	/* If searching the tree, set the focus there; otherwise, focus on the packet list */
-	if (cfile.search_in_progress && (cfile.decode_data || cfile.decode_data)) {
+	if (cfile.search_in_progress && cfile.decode_data) {
 		gtk_widget_grab_focus(tree_view_gbl);
 	} else {
 		gtk_widget_grab_focus(packetlist->view);
diff --git a/ui/gtk/profile_dlg.c b/ui/gtk/profile_dlg.c
index ffe73dfd4e..58eb4dc66b 100644
--- a/ui/gtk/profile_dlg.c
+++ b/ui/gtk/profile_dlg.c
@@ -695,7 +695,7 @@ profile_name_te_changed_cb(GtkWidget *w, gpointer data _U_)
   GtkWidget   *profile_l = g_object_get_data(G_OBJECT(main_w), E_PROF_PROFILE_L_KEY);
   profile_def *profile;
   GList       *fl_entry;
-  const gchar *name = "";
+  const gchar *name;
 
   GtkTreeSelection  *sel;
   GtkTreeModel      *model;
diff --git a/ui/gtk/rlc_lte_stat_dlg.c b/ui/gtk/rlc_lte_stat_dlg.c
index f39b7f37f6..8dce4f45b0 100644
--- a/ui/gtk/rlc_lte_stat_dlg.c
+++ b/ui/gtk/rlc_lte_stat_dlg.c
@@ -1143,7 +1143,7 @@ static void ul_filter_clicked(GtkWindow *win _U_, rlc_lte_stat_t* hs)
     guint16  channelType;
     guint16  channelId;
     int      sn = -1;
-    const gchar *sn_string = "";
+    const gchar *sn_string;
 
     /* Read SN to filter on (if present) */
     sn_string = gtk_entry_get_text(GTK_ENTRY(hs->sn_filter_te));
@@ -1172,7 +1172,7 @@ static void dl_filter_clicked(GtkWindow *win _U_, rlc_lte_stat_t* hs)
     guint16  channelType;
     guint16  channelId;
     int      sn = -1;
-    const gchar *sn_string = "";
+    const gchar *sn_string;
 
     /* Read SN to filter on (if present) */
     sn_string = gtk_entry_get_text(GTK_ENTRY(hs->sn_filter_te));
@@ -1201,7 +1201,7 @@ static void uldl_filter_clicked(GtkWindow *win _U_, rlc_lte_stat_t* hs)
     guint16  channelType;
     guint16  channelId;
     int      sn = -1;
-    const gchar *sn_string = "";
+    const gchar *sn_string;
 
     /* Read SN to filter on (if present) */
     sn_string = gtk_entry_get_text(GTK_ENTRY(hs->sn_filter_te));
diff --git a/ui/gtk/rtp_analysis.c b/ui/gtk/rtp_analysis.c
index 702f543133..54b6c2e29d 100644
--- a/ui/gtk/rtp_analysis.c
+++ b/ui/gtk/rtp_analysis.c
@@ -3374,7 +3374,7 @@ GtkWidget* create_list(user_data_t* user_data)
 /* Create the dialog box with all widgets */
 static void create_rtp_dialog(user_data_t* user_data)
 {
-	GtkWidget *window = NULL;
+	GtkWidget *window;
 	GtkWidget *list_fwd;
 	GtkWidget *list_rev;
 	GtkWidget *label_stats_fwd;
@@ -3386,7 +3386,7 @@ static void create_rtp_dialog(user_data_t* user_data)
 	GtkWidget *scrolled_window, *scrolled_window_r/*, *frame, *text, *label4, *page_help*/;
 	GtkWidget *box4, *voice_bt, *refresh_bt, *goto_bt, *close_bt, *csv_bt, *next_bt;
 #ifdef HAVE_LIBPORTAUDIO
-	GtkWidget *player_bt = NULL;
+	GtkWidget *player_bt;
 #endif /* HAVE_LIBPORTAUDIO */
 	GtkWidget *graph_bt;
 	gchar label_forward[150];
diff --git a/ui/gtk/rtp_player.c b/ui/gtk/rtp_player.c
index e2ef3447f7..eb9e661b7d 100644
--- a/ui/gtk/rtp_player.c
+++ b/ui/gtk/rtp_player.c
@@ -1763,7 +1763,7 @@ button_press_event_channel(GtkWidget *widget _U_, GdkEventButton *event _U_, gpo
 static void
 add_channel_to_window(gchar *key _U_ , rtp_channel_info_t *rci, guint *counter _U_ )
 {
-	GString *label = NULL;
+	GString *label;
 	GtkWidget *viewport;
 
 
diff --git a/ui/gtk/sctp_assoc_analyse.c b/ui/gtk/sctp_assoc_analyse.c
index de61d76de4..5105cd7545 100644
--- a/ui/gtk/sctp_assoc_analyse.c
+++ b/ui/gtk/sctp_assoc_analyse.c
@@ -115,7 +115,7 @@ on_notebook_switch_page(void)
 
 static void on_chunk_stat_bt(GtkWidget *widget _U_, struct sctp_analyse* u_data)
 {
-	sctp_assoc_info_t* assinfo = NULL;
+	sctp_assoc_info_t* assinfo;
 	int i;
 
 	assinfo = &static_assoc;
@@ -142,7 +142,7 @@ static void on_close_dlg(GtkWidget *widget _U_, struct sctp_analyse* u_data)
 
 static void on_chunk1_dlg(GtkWidget *widget _U_, struct sctp_analyse* u_data)
 {
-sctp_assoc_info_t* assinfo = NULL;
+sctp_assoc_info_t* assinfo;
 
 	assinfo = &static_assoc;
 	assinfo->addr_chunk_count = (static_assoc.addr_chunk_count);
@@ -152,7 +152,7 @@ sctp_assoc_info_t* assinfo = NULL;
 
 static void on_chunk2_dlg(GtkWidget *widget _U_, struct sctp_analyse* u_data)
 {
-sctp_assoc_info_t* assinfo=NULL;
+sctp_assoc_info_t* assinfo;
 
 	assinfo = &static_assoc;
 	assinfo->addr_chunk_count = (static_assoc.addr_chunk_count);
@@ -505,7 +505,7 @@ GtkWidget *create_list(void)
 
 static void create_analyse_window(struct sctp_analyse* u_data)
 {
-	GtkWidget *window = NULL;
+	GtkWidget *window;
 	GtkWidget *notebook;
 	GtkWidget *main_vb, *page1, *page2, *page3, *hbox, *vbox_l, *vbox_r, *addr_hb, *stat_fr;
 	GtkWidget *hbox_l1, *hbox_l2,*label, *h_button_box;