Fix more "no previous declaration" warnings

svn path=/trunk/; revision=15173

13 files changed, 31 insertions, 27 deletions

diff --git a/gtk/capture_if_dlg.c b/gtk/capture_if_dlg.c
index 190a5ee5ae..baa041a07e 100644
--- a/gtk/capture_if_dlg.c
+++ b/gtk/capture_if_dlg.c
@@ -156,7 +156,7 @@ capture_details_cb(GtkWidget *details_bt _U_, gpointer if_data)
 
 
 /* open a single interface */
-void
+static void
 open_if(gchar *name, if_dlg_data_t *if_dlg_data)
 {
   gchar       open_err_str[PCAP_ERRBUF_SIZE];
@@ -240,7 +240,7 @@ update_if(if_dlg_data_t *if_dlg_data)
 
 
 /* close a single interface */
-void
+static void
 close_if(if_dlg_data_t *if_dlg_data)
 {
     if(if_dlg_data->pch)
@@ -250,7 +250,7 @@ close_if(if_dlg_data_t *if_dlg_data)
 
 
 /* update all interfaces */
-gboolean
+static gboolean
 update_all(gpointer data)
 {
     GList *curr;
diff --git a/gtk/cfilter_combo_utils.c b/gtk/cfilter_combo_utils.c
index a114530c63..ef0821ea79 100644
--- a/gtk/cfilter_combo_utils.c
+++ b/gtk/cfilter_combo_utils.c
@@ -40,7 +40,7 @@
 /* XXX: use a preference for this setting! */
 static guint cfilter_combo_max_recent = 20;
 
-gboolean
+static gboolean
 cfilter_combo_add(gchar *s) {
   GList     *li;
   GList     *fl = OBJECT_GET_DATA(top_level, E_CFILTER_FL_KEY);
diff --git a/gtk/color_dlg.c b/gtk/color_dlg.c
index 3fc9b900e8..c85218bf13 100644
--- a/gtk/color_dlg.c
+++ b/gtk/color_dlg.c
@@ -500,7 +500,7 @@ add_filter_to_list(gpointer filter_arg, gpointer list_arg)
   num_of_filters++;
 }
 
-void move_this_row (GtkWidget   *color_filters, 
+static void move_this_row (GtkWidget   *color_filters, 
                      gint         filter_number,
                      gint         amount)            /* only tested with +1(down) and -1(up) */
 {
@@ -689,7 +689,7 @@ struct remember_data
 };
 /* called for each selected row in the tree.
 */
-void remember_this_row (GtkTreeModel *model, GtkTreePath *path, GtkTreeIter *iter, gpointer arg)
+static void remember_this_row (GtkTreeModel *model, GtkTreePath *path, GtkTreeIter *iter, gpointer arg)
 {
     gint         *path_index;
     color_filter_t *colorf;
@@ -1081,7 +1081,7 @@ color_clear_cmd(GtkWidget *widget)
 }
 
 /* clear button: user responded to question */
-void color_clear_answered_cb(gpointer dialog _U_, gint btn, gpointer data)
+static void color_clear_answered_cb(gpointer dialog _U_, gint btn, gpointer data)
 {
     switch(btn) {
     case(ESD_BTN_CLEAR):
diff --git a/gtk/decode_as_dlg.c b/gtk/decode_as_dlg.c
index d874e89812..0e270c6b65 100644
--- a/gtk/decode_as_dlg.c
+++ b/gtk/decode_as_dlg.c
@@ -1548,7 +1548,7 @@ decode_add_tcpudp_page (gchar *prompt, gchar *table_name)
     return(page);
 }
 
-void
+static void
 decode_sctp_list_menu_start(GtkWidget **list_p, GtkWidget **scrolled_win_p)
 {
 #if GTK_MAJOR_VERSION < 2
diff --git a/gtk/file_dlg.c b/gtk/file_dlg.c
index a445850e3a..8fcf6a1a79 100644
--- a/gtk/file_dlg.c
+++ b/gtk/file_dlg.c
@@ -430,7 +430,7 @@ preview_new(void)
 static GtkWidget *file_open_w;
 
 /* Open a file */
-void
+static void
 file_open_cmd(GtkWidget *w)
 {
   GtkWidget	*main_hb, *main_vb, *filter_hbox, *filter_bt, *filter_te,
@@ -757,7 +757,7 @@ file_open_destroy_cb(GtkWidget *win _U_, gpointer user_data _U_)
 static GtkWidget *file_merge_w;
 
 /* Merge existing with another file */
-void
+static void
 file_merge_cmd(GtkWidget *w)
 {
   GtkWidget	*main_hb, *main_vb, *ft_hb, *ft_lb, *filter_hbox,
@@ -1116,7 +1116,7 @@ file_merge_destroy_cb(GtkWidget *win _U_, gpointer user_data _U_)
 }
 
 
-void file_close_answered_cb(gpointer dialog _U_, gint btn, gpointer data _U_)
+static void file_close_answered_cb(gpointer dialog _U_, gint btn, gpointer data _U_)
 {
     switch(btn) {
     case(ESD_BTN_SAVE):
@@ -1763,7 +1763,7 @@ static GtkWidget *file_color_export_w;
  * Called when the "Export" dialog box is created and when the marked
  * count changes.
  */
-void
+static void
 color_set_export_marked_sensitive(GtkWidget * cfmark_cb)
 {
   if (file_color_export_w == NULL) {
diff --git a/gtk/fileset_dlg.c b/gtk/fileset_dlg.c
index 3cedeacae6..6fbf1138fd 100644
--- a/gtk/fileset_dlg.c
+++ b/gtk/fileset_dlg.c
@@ -202,7 +202,7 @@ fileset_dlg_add_file(fileset_entry *entry) {
 
 
 /* init the fileset table */
-void
+static void
 fileset_init_table(GtkWidget *parent)
 {
   GtkWidget     *fs_lb;
diff --git a/gtk/font_utils.c b/gtk/font_utils.c
index 917eee2c84..9cc8f610c2 100644
--- a/gtk/font_utils.c
+++ b/gtk/font_utils.c
@@ -37,6 +37,7 @@
 #include <windows.h>
 #endif
 
+#include "main.h"
 #include "recent.h"
 #include <epan/prefs.h>
 
diff --git a/gtk/graph_analysis.c b/gtk/graph_analysis.c
index ec6300dd16..320aa277ba 100644
--- a/gtk/graph_analysis.c
+++ b/gtk/graph_analysis.c
@@ -280,7 +280,7 @@ static void overwrite (char *string, char *text_to_insert, guint32 p1, guint32 p
 
 
 /****************************************************************************/
-gboolean dialog_graph_dump_to_file(graph_analysis_data_t* user_data)
+static gboolean dialog_graph_dump_to_file(graph_analysis_data_t* user_data)
 {
         guint32 i, first_node, display_items, display_nodes;
 		guint32 start_position, end_position, item_width, header_length;
@@ -1665,7 +1665,7 @@ static void dialog_graph_create_window(graph_analysis_data_t* user_data)
  * and Return -2 if the array is full
  */
 /****************************************************************************/
-gint is_node_array(graph_analysis_data_t* user_data, address* node)
+static gint is_node_array(graph_analysis_data_t* user_data, address* node)
 {
 	int i;
 	for (i=0; i<MAX_NUM_NODES; i++){
@@ -1678,7 +1678,7 @@ gint is_node_array(graph_analysis_data_t* user_data, address* node)
 
 /* Get the nodes from the list */
 /****************************************************************************/
-void get_nodes(graph_analysis_data_t* user_data)
+static void get_nodes(graph_analysis_data_t* user_data)
 {
 	GList* list;
 	graph_analysis_item_t *gai;
diff --git a/gtk/help_dlg.c b/gtk/help_dlg.c
index 74bfcff847..dc34285e6c 100644
--- a/gtk/help_dlg.c
+++ b/gtk/help_dlg.c
@@ -223,7 +223,7 @@ gboolean topic_available(topic_action_e action) {
 /*
  * Open the help dialog and show a specific help page.
  */
-void help_topic(gchar *topic) {
+static void help_topic(gchar *topic) {
     gchar       *page_topic;
     GtkWidget   *help_nb;
     GSList      *help_page_ent;
diff --git a/gtk/main.c b/gtk/main.c
index cb6d50f338..ac4ac1dc24 100644
--- a/gtk/main.c
+++ b/gtk/main.c
@@ -1508,7 +1508,7 @@ main_cf_cb_file_safe_reload_finished(gpointer data _U_)
     set_menus_for_unsaved_capture_file(FALSE);
 }
 
-void main_cf_callback(gint event, gpointer data, gpointer user_data _U_)
+static void main_cf_callback(gint event, gpointer data, gpointer user_data _U_)
 {
     switch(event) {
     case(cf_cb_file_closed):
@@ -2699,7 +2699,7 @@ console_log_handler(const char *log_domain, GLogLevelFlags log_level,
 }
 
 
-GtkWidget *info_bar_new(void)
+static GtkWidget *info_bar_new(void)
 {
     /* tip: tooltips don't work on statusbars! */
     info_bar = gtk_statusbar_new();
@@ -2714,7 +2714,7 @@ GtkWidget *info_bar_new(void)
     return info_bar;
 }
 
-GtkWidget *packets_bar_new(void)
+static GtkWidget *packets_bar_new(void)
 {
     /* tip: tooltips don't work on statusbars! */
     packets_bar = gtk_statusbar_new();
@@ -2728,11 +2728,11 @@ GtkWidget *packets_bar_new(void)
 /*
  * Helper for main_widgets_rearrange()
  */
-void foreach_remove_a_child(GtkWidget *widget, gpointer data) {
+static void foreach_remove_a_child(GtkWidget *widget, gpointer data) {
     gtk_container_remove(GTK_CONTAINER(data), widget);
 }
 
-GtkWidget *main_widget_layout(gint layout_content)
+static GtkWidget *main_widget_layout(gint layout_content)
 {
     switch(layout_content) {
     case(layout_pane_content_none):
@@ -3015,7 +3015,7 @@ welcome_new(void)
 }
 #endif /* 0 */
 
-GtkWidget *
+static GtkWidget *
 welcome_new(void)
 {
     /* this is just a dummy to fill up window space, simply showing nothing */
diff --git a/gtk/main.h b/gtk/main.h
index 821efb5ada..b0056adc6d 100644
--- a/gtk/main.h
+++ b/gtk/main.h
@@ -61,6 +61,9 @@
 typedef struct capture_options_tag * p_capture_options_t;
 extern p_capture_options_t capture_opts;
 
+extern void protect_thread_critical_region(void);
+extern void unprotect_thread_critical_region(void);
+
 /** User requested "Zoom In" by menu or toolbar.
  *
  * @param widget parent widget (unused)
diff --git a/gtk/packet_history.c b/gtk/packet_history.c
index b52a9f9ac6..4a3370028c 100644
--- a/gtk/packet_history.c
+++ b/gtk/packet_history.c
@@ -130,7 +130,7 @@ void packet_history_clear(void) {
 }
 
 
-void packet_history_back(void) {
+static void packet_history_back(void) {
     GList *previous;
 
     if(history_current) {
@@ -151,7 +151,7 @@ void packet_history_back(void) {
 }
 
 
-void packet_history_forward(void) {
+static void packet_history_forward(void) {
     GList *next;
 
     if(history_current) {
diff --git a/gtk/packet_list.c b/gtk/packet_list.c
index c45e9d94cd..8f3399b74d 100644
--- a/gtk/packet_list.c
+++ b/gtk/packet_list.c
@@ -310,7 +310,7 @@ set_frame_mark(gboolean set, frame_data *frame, gint row) {
 }
 
 /* call this after last set_frame_mark is done */
-void mark_frames_ready(void) {
+static void mark_frames_ready(void) {
   file_set_save_marked_sensitive();
   packets_bar_update();
 }
@@ -606,7 +606,7 @@ packet_list_freeze(void)
     eth_clist_freeze(ETH_CLIST(packet_list));
 }
 
-void
+static void
 packet_list_resize_columns(void) {
     int         i;
     int         progbar_nextstep;