Last set of trivial fixes for "no previous declaration" warnings.

svn path=/trunk/; revision=15191

9 files changed, 29 insertions, 29 deletions

diff --git a/epan/dissectors/packet-ndps.c b/epan/dissectors/packet-ndps.c
index 4bf955a02d..5ad415e0e3 100644
--- a/epan/dissectors/packet-ndps.c
+++ b/epan/dissectors/packet-ndps.c
@@ -3684,7 +3684,7 @@ static GMemChunk *ndps_req_hash_keys = NULL;
 static GMemChunk *ndps_req_hash_values = NULL;
 
 /* Hash Functions */
-gint
+static gint
 ndps_equal(gconstpointer v, gconstpointer v2)
 {
 	const ndps_req_hash_key	*val1 = (const ndps_req_hash_key*)v;
@@ -3697,7 +3697,7 @@ ndps_equal(gconstpointer v, gconstpointer v2)
 	return 0;
 }
 
-guint
+static guint
 ndps_hash(gconstpointer v)
 {
 	const ndps_req_hash_key	*ndps_key = (const ndps_req_hash_key*)v;
@@ -3750,7 +3750,7 @@ ndps_postseq_cleanup(void)
 	 * needed during random-access processing of the proto_tree.*/
 }
 
-ndps_req_hash_value*
+static ndps_req_hash_value*
 ndps_hash_insert(conversation_t *conversation, guint32 ndps_xport)
 {
 	ndps_req_hash_key		*request_key;
@@ -3775,7 +3775,7 @@ ndps_hash_insert(conversation_t *conversation, guint32 ndps_xport)
 }
 
 /* Returns the ncp_rec*, or NULL if not found. */
-ndps_req_hash_value*
+static ndps_req_hash_value*
 ndps_hash_lookup(conversation_t *conversation, guint32 ndps_xport)
 {
 	ndps_req_hash_key		request_key;
diff --git a/epan/dissectors/packet-sscop.c b/epan/dissectors/packet-sscop.c
index d0b50a19f0..108a02f979 100644
--- a/epan/dissectors/packet-sscop.c
+++ b/epan/dissectors/packet-sscop.c
@@ -168,7 +168,7 @@ static const value_string sscop_type_vals[] = {
 #define	SSCOP_SS_N_MR	(reported_length - 8)	/* lower 3 bytes thereof */
 #define	SSCOP_SS_N_R	(reported_length - 4)	/* lower 3 bytes thereof */
 
-extern void dissect_stat_list(proto_tree *tree, tvbuff_t *tvb,guint h) {
+static void dissect_stat_list(proto_tree *tree, tvbuff_t *tvb,guint h) {
 	gint n,i;
 	proto_item* pi;
 
@@ -341,7 +341,7 @@ dissect_sscop_and_payload(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, d
 }
 }
 
-extern void dissect_sscop(tvbuff_t* tvb, packet_info* pinfo,proto_tree* tree)
+static void dissect_sscop(tvbuff_t* tvb, packet_info* pinfo,proto_tree* tree)
 {
 	dissect_sscop_and_payload(tvb,pinfo,tree,default_handle);
 }
diff --git a/epan/dissectors/packet-tacacs.c b/epan/dissectors/packet-tacacs.c
index 07c6cc02d0..e2098e8889 100644
--- a/epan/dissectors/packet-tacacs.c
+++ b/epan/dissectors/packet-tacacs.c
@@ -1020,7 +1020,7 @@ dissect_tacplus(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 	}
 }
 
-void
+static void
 tacplus_pref_cb(void)
 {
 	parse_tacplus_keys( tacplus_opt_key );
diff --git a/epan/dissectors/packet-tds.c b/epan/dissectors/packet-tds.c
index d9a5f7b89f..fc33d6e98c 100644
--- a/epan/dissectors/packet-tds.c
+++ b/epan/dissectors/packet-tds.c
@@ -1300,7 +1300,7 @@ dissect_tds_login_ack_token(tvbuff_t *tvb, guint offset, guint token_sz, proto_t
 	offset += 4;
 }
 
-int 
+static int 
 dissect_tds7_results_token(tvbuff_t *tvb, guint offset, proto_tree *tree)
 {
 	guint16 num_columns, table_len;
diff --git a/epan/dissectors/packet-ymsg.c b/epan/dissectors/packet-ymsg.c
index 34e2743dd0..41dfbb8236 100644
--- a/epan/dissectors/packet-ymsg.c
+++ b/epan/dissectors/packet-ymsg.c
@@ -277,7 +277,7 @@ static const value_string ymsg_status_vals[] = {
 static guint get_ymsg_pdu_len(tvbuff_t *tvb, int offset);
 static void dissect_ymsg_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree);
 
-int
+static int
 get_content_item_length(tvbuff_t *tvb, int offset) {
 	int origoffset = offset;
 	guint16 curdata;
diff --git a/epan/stats_tree.c b/epan/stats_tree.c
index 150460afe9..693ce21e74 100644
--- a/epan/stats_tree.c
+++ b/epan/stats_tree.c
@@ -322,7 +322,7 @@ extern int stats_tree_packet(void* p, packet_info* pinfo, epan_dissect_t *edt, c
 		return 0;
 }
 
-extern GHashTable* stat_tree_registry(void) {
+static GHashTable* stat_tree_registry(void) {
 	return registry;
 }
 
diff --git a/gtk/menu.c b/gtk/menu.c
index c140a65e17..ab9a189631 100644
--- a/gtk/menu.c
+++ b/gtk/menu.c
@@ -585,7 +585,7 @@ menus_init(void) {
 }
 
 
-gint tap_menu_item_add_compare(gconstpointer a, gconstpointer b)
+static gint tap_menu_item_add_compare(gconstpointer a, gconstpointer b)
 {
     return strcmp(
         ((const menu_item_t *) a)->name, 
@@ -594,7 +594,7 @@ gint tap_menu_item_add_compare(gconstpointer a, gconstpointer b)
 
 
 /* add a menuitem below the current node */
-GList * tap_menu_item_add(
+static GList * tap_menu_item_add(
     char *name, 
     gint group, 
     GtkItemFactoryCallback callback,
@@ -756,7 +756,7 @@ register_tap_menu_item(
 }
 
 
-guint merge_tap_menus_layered(GList *node, gint group) {
+static guint merge_tap_menus_layered(GList *node, gint group) {
     GtkItemFactoryEntry *entry;
     GList       *child;
     guint       added = 0;
@@ -931,7 +931,7 @@ set_menu_sensitivity(GtkItemFactory *ifactory, const gchar *path, gint val)
   g_free(dup);
 }
 
-void
+static void
 set_menu_object_data_meat(GtkItemFactory *ifactory, gchar *path, gchar *key, gpointer data)
 {
 	GtkWidget *menu = NULL;
@@ -962,7 +962,7 @@ set_menu_object_data (gchar *path, gchar *key, gpointer data) {
 #define MENU_RECENT_FILES_PATH "/File/Open Recent"
 #define MENU_RECENT_FILES_KEY "Recent File Name"
 
-void
+static void
 update_menu_recent_capture_file1(GtkWidget *widget, gpointer cnt) {
     gchar *widget_cf_name;
 
diff --git a/plugins/mate/mate_util.c b/plugins/mate/mate_util.c
index 8137f0cd56..62a0a5e188 100644
--- a/plugins/mate/mate_util.c
+++ b/plugins/mate/mate_util.c
@@ -225,7 +225,7 @@ void scs_unsubscribe(SCS_collection* c, gchar* s) {
  * Return value: the stored copy of the formated string.
  *
  **/
-extern gchar* scs_subscribe_printf(SCS_collection* c, gchar* fmt, ...) {
+gchar* scs_subscribe_printf(SCS_collection* c, gchar* fmt, ...) {
 	va_list list;
 	static gchar buf[SCS_HUGE_SIZE];
 	
@@ -236,7 +236,7 @@ extern gchar* scs_subscribe_printf(SCS_collection* c, gchar* fmt, ...) {
 	return scs_subscribe(c,buf);
 }
 
-extern gchar* scs_subscribe_int(SCS_collection* c, int i) {
+static gchar* scs_subscribe_int(SCS_collection* c, int i) {
 	static gchar buf[SCS_SMALL_SIZE];
 	
 	g_snprintf(buf, SCS_SMALL_SIZE-1 ,"%i", i);
@@ -244,7 +244,7 @@ extern gchar* scs_subscribe_int(SCS_collection* c, int i) {
 	return scs_subscribe(c,buf);
 }
 
-extern gchar* scs_subscribe_float(SCS_collection* c, float f) {
+static gchar* scs_subscribe_float(SCS_collection* c, float f) {
 	static gchar buf[SCS_SMALL_SIZE];
 	
 	g_snprintf(buf, SCS_SMALL_SIZE-1 ,"%f", f);
@@ -453,7 +453,7 @@ extern AVP* avp_copy(AVP* from) {
 }
 
 
-extern void rename_avp(AVP* avp, gchar* name) {
+static void rename_avp(AVP* avp, gchar* name) {
 	gchar* s = avp->n;
 	avp->n = scs_subscribe(avp_strings,name);
 	scs_unsubscribe(avp_strings,s);
@@ -1312,7 +1312,7 @@ extern AVPL* new_avpl_from_match(avpl_match_mode mode, const gchar* name,AVPL* s
  *
  * Return value: a pointer to the newly created avpl transformation
  **/
-extern AVPL_Transf* new_avpl_transform(gchar* name, AVPL* mixed, avpl_match_mode match_mode, avpl_replace_mode replace_mode) {
+static AVPL_Transf* new_avpl_transform(gchar* name, AVPL* mixed, avpl_match_mode match_mode, avpl_replace_mode replace_mode) {
 	AVPL_Transf* t = g_malloc(sizeof(AVPL_Transf));
 	AVP* avp;
 
@@ -1614,7 +1614,7 @@ extern void delete_loal(LoAL* loal, gboolean avpls_too, gboolean avps_too) {
  * load_loal_error:
  * Used by loal_from_file to handle errors while loading.
  **/
-LoAL* load_loal_error(FILE* fp, LoAL* loal, AVPL* curr, int linenum, const gchar* fmt, ...) {
+static LoAL* load_loal_error(FILE* fp, LoAL* loal, AVPL* curr, int linenum, const gchar* fmt, ...) {
 	va_list list;
 	gchar* desc;
 	LoAL* ret = NULL;
diff --git a/plugins/mate/packet-mate.c b/plugins/mate/packet-mate.c
index abd941f8ab..744c35bf36 100644
--- a/plugins/mate/packet-mate.c
+++ b/plugins/mate/packet-mate.c
@@ -42,7 +42,7 @@ static const gchar* current_mate_config_filename = NULL;
 
 static proto_item *mate_i = NULL;
 
-void pdu_attrs_tree(proto_tree* tree, tvbuff_t *tvb, mate_pdu* pdu) {
+static void pdu_attrs_tree(proto_tree* tree, tvbuff_t *tvb, mate_pdu* pdu) {
 	AVPN* c;
 	proto_item *avpl_i;
 	proto_tree *avpl_t;
@@ -63,7 +63,7 @@ void pdu_attrs_tree(proto_tree* tree, tvbuff_t *tvb, mate_pdu* pdu) {
 	}
 }
 
-void gop_attrs_tree(proto_tree* tree, tvbuff_t *tvb, mate_gop* gop) {
+static void gop_attrs_tree(proto_tree* tree, tvbuff_t *tvb, mate_gop* gop) {
 	AVPN* c;
 	proto_item *avpl_i;
 	proto_tree *avpl_t;
@@ -84,7 +84,7 @@ void gop_attrs_tree(proto_tree* tree, tvbuff_t *tvb, mate_gop* gop) {
 	}
 }
 
-void gog_attrs_tree(proto_tree* tree, tvbuff_t *tvb, mate_gog* gog) {
+static void gog_attrs_tree(proto_tree* tree, tvbuff_t *tvb, mate_gog* gog) {
 	AVPN* c;
 	proto_item *avpl_i;
 	proto_tree *avpl_t;
@@ -105,9 +105,9 @@ void gog_attrs_tree(proto_tree* tree, tvbuff_t *tvb, mate_gog* gog) {
 	}
 }
 
-void mate_gop_tree(proto_tree* pdu_tree, tvbuff_t *tvb, mate_gop* gop);
+static void mate_gop_tree(proto_tree* pdu_tree, tvbuff_t *tvb, mate_gop* gop);
 
-void mate_gog_tree(proto_tree* tree, tvbuff_t *tvb, mate_gog* gog, mate_gop* gop) {
+static void mate_gog_tree(proto_tree* tree, tvbuff_t *tvb, mate_gog* gog, mate_gop* gop) {
 	proto_item *gog_item;
 	proto_tree *gog_tree;
 	proto_item *gog_time_item;
@@ -185,7 +185,7 @@ void mate_gog_tree(proto_tree* tree, tvbuff_t *tvb, mate_gog* gog, mate_gop* gop
 	}
 }
 
-void mate_gop_tree(proto_tree* tree, tvbuff_t *tvb, mate_gop* gop) {
+static void mate_gop_tree(proto_tree* tree, tvbuff_t *tvb, mate_gop* gop) {
 	proto_item *gop_item;
 	proto_tree *gop_time_tree;
 	proto_item *gop_time_item;
@@ -259,7 +259,7 @@ void mate_gop_tree(proto_tree* tree, tvbuff_t *tvb, mate_gop* gop) {
 }
 
 
-void mate_pdu_tree(mate_pdu *pdu, tvbuff_t *tvb, proto_tree* tree) {
+static void mate_pdu_tree(mate_pdu *pdu, tvbuff_t *tvb, proto_tree* tree) {
 	proto_item *pdu_item;
 	proto_tree *pdu_tree;
 	
@@ -295,7 +295,7 @@ void mate_pdu_tree(mate_pdu *pdu, tvbuff_t *tvb, proto_tree* tree) {
 	}
 }
 
-extern void mate_tree(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) {
+static void mate_tree(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) {
 	mate_pdu* pdus;
 	proto_tree *mate_t;