Move declarations of routines in gtk/capture_if_dlg.c into

gtk/capture_if_dlg.h.  Include that header when appropriate.

Get rid of include of <sys/wait.h> in gtk/capture_if_dlg.c; there's no
forking or waiting in there.

Make update_if() in gtk/capture_if_dlg.c static - it's not used outside
that file.

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

diff --git a/gtk/Makefile.common b/gtk/Makefile.common
index 42f8650522781c9ed3f92f2dd3343202f3cfb146..66d4413ed04cda670924bd8163f5b577e07e2b5a 100644 (file)
--- a/gtk/Makefile.common
+++ b/gtk/Makefile.common
@@ -211,6 +211,7 @@ noinst_HEADERS = \
        capture_dlg.h   \
        capture_file_dlg.h      \
        capture_globals.h       \
+       capture_if_dlg.h        \
        cfilter_combo_utils.h \
        color_dlg.h     \
        color_edit_dlg.h        \

diff --git a/gtk/capture_dlg.h b/gtk/capture_dlg.h
index e0f5ca9729d4cae78262523021826f7d008e99ee..765bb4e084823571add6ae36fbaf3c90bffc2bec 100644 (file)
--- a/gtk/capture_dlg.h
+++ b/gtk/capture_dlg.h
@@ -63,14 +63,6 @@ void capture_restart_cb(GtkWidget *widget, gpointer data);
 /* capture start confirmed by "Save unsaved capture", so do it now */
 void capture_start_confirmed(void);
 
-/** User requested the "Capture Interfaces" dialog box by menu or toolbar.
- *
- * @param widget parent widget (unused)
- * @param data unused
- */
-void
-capture_if_cb(GtkWidget *widget, gpointer data);
-
 /** User requested the "Capture Airpcap" dialog box by menu or toolbar.
  *
  * @param widget parent widget (unused)
@@ -79,21 +71,6 @@ capture_if_cb(GtkWidget *widget, gpointer data);
 void
 capture_air_cb(GtkWidget *widget, gpointer data);
 
-/** User requested the "Capture Interfaces" dialog box by menu or toolbar.
- *
- * @param capture_in_progress capture is in progress
- */
-void
-set_capture_if_dialog_for_capture_in_progress(gboolean capture_in_progress);
-
-#include "capture-pcap-util.h" /* for if_info_t */
-
-/*
- * Used to retrieve the interface icon
- */
-GtkWidget *
-capture_get_if_icon(const if_info_t* if_info);
-
 #ifdef HAVE_PCAP_REMOTE
 struct remote_host {
   gchar    *remote_host;          /**< Host name or network address for remote capturing */

diff --git a/gtk/capture_if_dlg.c b/gtk/capture_if_dlg.c
index 5f3338fb37cd88b1ee34e444f58fc4285de17cab..e67891c7c5f0f77dfe09e26af297fd3f840d4658 100644 (file)
--- a/gtk/capture_if_dlg.c
+++ b/gtk/capture_if_dlg.c
@@ -26,13 +26,8 @@
 # include "config.h"
 #endif
 
-#ifdef HAVE_SYS_WAIT_H
-# include <sys/wait.h>
-#endif
-
 #include <gtk/gtk.h>
 
-
 #ifdef HAVE_LIBPCAP
 
 #include <string.h>
@@ -54,6 +49,7 @@
 
 #include "gtk/stock_icons.h"
 #include "gtk/capture_dlg.h"
+#include "gtk/capture_if_dlg.h"
 #include "gtk/recent.h"
 #include "gtk/gui_utils.h"
 #include "gtk/dlg_utils.h"
@@ -198,7 +194,7 @@ capture_details_cb(GtkWidget *details_bt _U_, gpointer if_data)
 #endif
 
 /* update a single interface */
-void
+static void
 update_if(if_dlg_data_t *if_dlg_data, if_stat_cache_t *sc)
 {
   struct pcap_stat stats;

diff --git a/gtk/capture_if_dlg.h b/gtk/capture_if_dlg.h
new file mode 100644 (file)
index 0000000..aa15b5a
--- /dev/null
+++ b/gtk/capture_if_dlg.h
@@ -0,0 +1,57 @@
+/* capture_if_dlg.h
+ * Definitions for packet capture interface windows
+ *
+ * $Id$
+ *
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
+ * Copyright 1998 Gerald Combs
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+
+#ifndef __CAPTURE_IF_DLG_H__
+#define __CAPTURE_IF_DLG_H__
+
+/** User requested the "Capture Interfaces" dialog box by menu or toolbar.
+ *
+ * @param capture_in_progress capture is in progress
+ */
+void
+set_capture_if_dialog_for_capture_in_progress(gboolean capture_in_progress);
+
+#ifdef HAVE_LIBPCAP
+
+#include "capture-pcap-util.h" /* for if_info_t */
+
+/** User requested the "Capture Interfaces" dialog box by menu or toolbar.
+ *
+ * @param widget parent widget (unused)
+ * @param data unused
+ */
+void
+capture_if_cb(GtkWidget *widget, gpointer data);
+
+/*
+ * Used to retrieve the interface icon
+ */
+GtkWidget *
+capture_get_if_icon(const if_info_t* if_info);
+
+#endif /* HAVE_LIBPCAP */
+
+#endif /* capture_if_dlg.h */
+
+

diff --git a/gtk/main.c b/gtk/main.c
index edcea32eb6add4a45748a9e87b84b9d245e672c1..ed50229ae254dcb0de56b1837fa37ebe6b64f95c 100644 (file)
--- a/gtk/main.c
+++ b/gtk/main.c
@@ -149,6 +149,7 @@
 #include "gtk/decode_as_dlg.h"
 #include "gtk/webbrowser.h"
 #include "gtk/capture_dlg.h"
+#include "gtk/capture_if_dlg.h"
 #include "gtk/tap_dfilter_dlg.h"
 
 #ifdef HAVE_LIBPCAP

diff --git a/gtk/main_menu.c b/gtk/main_menu.c
index a2c711dd8c429b40327b7ce985a70d1b3b60e3ac..87c081dd74059d86f34e5ae9beb93915b6be68ee 100644 (file)
--- a/gtk/main_menu.c
+++ b/gtk/main_menu.c
@@ -52,6 +52,7 @@
 
 #include "gtk/about_dlg.h"
 #include "gtk/capture_dlg.h"
+#include "gtk/capture_if_dlg.h"
 #include "gtk/color_dlg.h"
 #include "gtk/filter_dlg.h"
 #include "gtk/profile_dlg.h"

diff --git a/gtk/main_toolbar.c b/gtk/main_toolbar.c
index be6b4fcfaa913dcfa810c1bd91d2b2de3e2454fd..7a2e45809de63a640897fb702b42b632cbc75262 100644 (file)
--- a/gtk/main_toolbar.c
+++ b/gtk/main_toolbar.c
@@ -41,6 +41,7 @@
 
 #ifdef HAVE_LIBPCAP
 #include "gtk/capture_dlg.h"
+#include "gtk/capture_if_dlg.h"
 #endif /* HAVE_LIBPCAP */
 #include "gtk/filter_dlg.h"
 #include "gtk/capture_file_dlg.h"

diff --git a/gtk/main_welcome.c b/gtk/main_welcome.c
index bc4fdc38eb5f4626793a54eadc5e7cac879f0ca0..95b6494ea77ca2fc81347007051371a4efd5c395 100644 (file)
--- a/gtk/main_welcome.c
+++ b/gtk/main_welcome.c
@@ -50,6 +50,7 @@
 #include "gtk/main_menu.h"
 #include "gtk/main_welcome.h"
 #include "gtk/capture_dlg.h"
+#include "gtk/capture_if_dlg.h"
 #include "gtk/capture_file_dlg.h"
 #include "gtk/help_dlg.h"
 #include "gtk/stock_icons.h"