summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexis La Goutte <alexis.lagoutte@gmail.com>2016-11-12 15:46:43 +0100
committerMichael Mann <mmann78@netscape.net>2016-11-12 19:51:54 +0000
commit40b98600bd6a26ab716de2577246f00cd52bf4ef (patch)
treeb892fbf78dce7c6b7bcf7c12105eaf0e83895f15
parent76f74ac6058f78d563265699e137679eb429a109 (diff)
downloadwireshark-40b98600bd6a26ab716de2577246f00cd52bf4ef.tar.gz
fix no previous prototype for ‘capture_*’ [-Wmissing-prototypes]
Change-Id: Ie5bfe4d366a679ebcb561716f23d174e7b9bf487 Reviewed-on: https://code.wireshark.org/review/18754 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
-rw-r--r--epan/dissectors/packet-arp.c2
-rw-r--r--epan/dissectors/packet-ax25.c2
-rw-r--r--epan/dissectors/packet-chdlc.c2
-rw-r--r--epan/dissectors/packet-eth.c2
-rw-r--r--epan/dissectors/packet-ieee80211-wlancap.c2
-rw-r--r--epan/dissectors/packet-ieee80211.c4
-rw-r--r--epan/dissectors/packet-ip.c2
-rw-r--r--epan/dissectors/packet-ipv6.c4
-rw-r--r--epan/dissectors/packet-ipx.c2
-rw-r--r--epan/dissectors/packet-isl.c2
-rw-r--r--epan/dissectors/packet-llc.c4
-rw-r--r--epan/dissectors/packet-ppp.c2
-rw-r--r--epan/dissectors/packet-tr.c2
13 files changed, 16 insertions, 16 deletions
diff --git a/epan/dissectors/packet-arp.c b/epan/dissectors/packet-arp.c
index 9d352939d9..789aee2a7d 100644
--- a/epan/dissectors/packet-arp.c
+++ b/epan/dissectors/packet-arp.c
@@ -1363,7 +1363,7 @@ dissect_ax25arp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data
return tvb_captured_length(tvb);
}
-gboolean
+static gboolean
capture_arp(const guchar *pd _U_, int offset _U_, int len _U_, capture_packet_info_t *cpinfo, const union wtap_pseudo_header *pseudo_header _U_)
{
capture_dissector_increment_count(cpinfo, proto_arp);
diff --git a/epan/dissectors/packet-ax25.c b/epan/dissectors/packet-ax25.c
index 8bfb0e3e7f..2f5a59f022 100644
--- a/epan/dissectors/packet-ax25.c
+++ b/epan/dissectors/packet-ax25.c
@@ -251,7 +251,7 @@ dissect_ax25( tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, void*
return tvb_captured_length(tvb);
}
-gboolean
+static gboolean
capture_ax25( const guchar *pd, int offset, int len, capture_packet_info_t *cpinfo, const union wtap_pseudo_header *pseudo_header)
{
guint8 control;
diff --git a/epan/dissectors/packet-chdlc.c b/epan/dissectors/packet-chdlc.c
index 6cb9611985..02a38e9701 100644
--- a/epan/dissectors/packet-chdlc.c
+++ b/epan/dissectors/packet-chdlc.c
@@ -113,7 +113,7 @@ const value_string chdlc_vals[] = {
{0, NULL}
};
-gboolean
+static gboolean
capture_chdlc( const guchar *pd, int offset, int len, capture_packet_info_t *cpinfo, const union wtap_pseudo_header *pseudo_header) {
if (!BYTES_ARE_IN_FRAME(offset, len, 4))
return FALSE;
diff --git a/epan/dissectors/packet-eth.c b/epan/dissectors/packet-eth.c
index 65b5bf5a70..b07726fb4f 100644
--- a/epan/dissectors/packet-eth.c
+++ b/epan/dissectors/packet-eth.c
@@ -193,7 +193,7 @@ eth_build_filter(packet_info *pinfo)
#define ETHERNET_802_3 2
#define ETHERNET_SNAP 3
-gboolean
+static gboolean
capture_eth(const guchar *pd, int offset, int len, capture_packet_info_t *cpinfo, const union wtap_pseudo_header *pseudo_header)
{
guint16 etype, length;
diff --git a/epan/dissectors/packet-ieee80211-wlancap.c b/epan/dissectors/packet-ieee80211-wlancap.c
index 04691c282d..99f3d8603e 100644
--- a/epan/dissectors/packet-ieee80211-wlancap.c
+++ b/epan/dissectors/packet-ieee80211-wlancap.c
@@ -74,7 +74,7 @@ static dissector_handle_t wlancap_handle;
static capture_dissector_handle_t wlancap_cap_handle;
static capture_dissector_handle_t ieee80211_cap_handle;
-gboolean
+static gboolean
capture_wlancap(const guchar *pd, int offset, int len, capture_packet_info_t *cpinfo, const union wtap_pseudo_header *pseudo_header _U_)
{
guint32 length;
diff --git a/epan/dissectors/packet-ieee80211.c b/epan/dissectors/packet-ieee80211.c
index c6d14943c2..a226db15b5 100644
--- a/epan/dissectors/packet-ieee80211.c
+++ b/epan/dissectors/packet-ieee80211.c
@@ -5635,7 +5635,7 @@ capture_ieee80211_common(const guchar * pd, int offset, int len,
/*
* Handle 802.11 with a variable-length link-layer header.
*/
-gboolean
+static gboolean
capture_ieee80211(const guchar * pd, int offset, int len, capture_packet_info_t *cpinfo, const union wtap_pseudo_header *pseudo_header _U_)
{
return capture_ieee80211_common (pd, offset, len, cpinfo, pseudo_header, FALSE);
@@ -5644,7 +5644,7 @@ capture_ieee80211(const guchar * pd, int offset, int len, capture_packet_info_t
/*
* Handle 802.11 with a variable-length link-layer header and data padding.
*/
-gboolean
+static gboolean
capture_ieee80211_datapad(const guchar * pd, int offset, int len,
capture_packet_info_t *cpinfo, const union wtap_pseudo_header *pseudo_header _U_)
{
diff --git a/epan/dissectors/packet-ip.c b/epan/dissectors/packet-ip.c
index ed04abeb11..8f9aecefbe 100644
--- a/epan/dissectors/packet-ip.c
+++ b/epan/dissectors/packet-ip.c
@@ -569,7 +569,7 @@ ip_defragment_cleanup(void)
reassembly_table_destroy(&ip_reassembly_table);
}
-gboolean
+static gboolean
capture_ip(const guchar *pd, int offset, int len, capture_packet_info_t *cpinfo, const union wtap_pseudo_header *pseudo_header _U_) {
if (!BYTES_ARE_IN_FRAME(offset, len, IPH_MIN_LEN))
return FALSE;
diff --git a/epan/dissectors/packet-ipv6.c b/epan/dissectors/packet-ipv6.c
index 96bf1724c9..922c9f8bd1 100644
--- a/epan/dissectors/packet-ipv6.c
+++ b/epan/dissectors/packet-ipv6.c
@@ -654,7 +654,7 @@ static const value_string routing_header_type[] = {
{ 0, NULL }
};
-gboolean
+static gboolean
capture_ipv6(const guchar *pd, int offset, int len, capture_packet_info_t *cpinfo, const union wtap_pseudo_header *pseudo_header)
{
guint8 nxt;
@@ -670,7 +670,7 @@ capture_ipv6(const guchar *pd, int offset, int len, capture_packet_info_t *cpinf
return try_capture_dissector("ip.proto", nxt, pd, offset, len, cpinfo, pseudo_header);
}
-gboolean
+static gboolean
capture_ipv6_exthdr(const guchar *pd, int offset, int len, capture_packet_info_t *cpinfo, const union wtap_pseudo_header *pseudo_header)
{
guint8 nxt;
diff --git a/epan/dissectors/packet-ipx.c b/epan/dissectors/packet-ipx.c
index da8f9d837e..0865dd76f7 100644
--- a/epan/dissectors/packet-ipx.c
+++ b/epan/dissectors/packet-ipx.c
@@ -273,7 +273,7 @@ static const value_string ipxmsg_sigchar_vals[] = {
{ 0, NULL }
};
-gboolean
+static gboolean
capture_ipx(const guchar *pd _U_, int offset _U_, int len _U_, capture_packet_info_t *cpinfo, const union wtap_pseudo_header *pseudo_header _U_)
{
capture_dissector_increment_count(cpinfo, proto_ipx);
diff --git a/epan/dissectors/packet-isl.c b/epan/dissectors/packet-isl.c
index 068bc45e5d..862c4dbafd 100644
--- a/epan/dissectors/packet-isl.c
+++ b/epan/dissectors/packet-isl.c
@@ -91,7 +91,7 @@ static dissector_handle_t tr_handle;
static capture_dissector_handle_t eth_cap_handle;
static capture_dissector_handle_t tr_cap_handle;
-gboolean
+static gboolean
capture_isl(const guchar *pd, int offset, int len, capture_packet_info_t *cpinfo, const union wtap_pseudo_header *pseudo_header _U_)
{
guint8 type;
diff --git a/epan/dissectors/packet-llc.c b/epan/dissectors/packet-llc.c
index 9556843c2a..252da4fa81 100644
--- a/epan/dissectors/packet-llc.c
+++ b/epan/dissectors/packet-llc.c
@@ -247,7 +247,7 @@ llc_add_oui(guint32 oui, const char *table_name, const char *table_ui_name,
g_hash_table_insert(oui_info_table, GUINT_TO_POINTER(oui), new_info);
}
-gboolean
+static gboolean
capture_snap(const guchar *pd, int offset, int len, capture_packet_info_t *cpinfo, const union wtap_pseudo_header *pseudo_header _U_)
{
guint32 oui;
@@ -288,7 +288,7 @@ capture_snap(const guchar *pd, int offset, int len, capture_packet_info_t *cpinf
return FALSE;
}
-gboolean
+static gboolean
capture_llc(const guchar *pd, int offset, int len, capture_packet_info_t *cpinfo, const union wtap_pseudo_header *pseudo_header _U_) {
int is_snap;
diff --git a/epan/dissectors/packet-ppp.c b/epan/dissectors/packet-ppp.c
index 49270311e3..16188fc705 100644
--- a/epan/dissectors/packet-ppp.c
+++ b/epan/dissectors/packet-ppp.c
@@ -1977,7 +1977,7 @@ decode_fcs(tvbuff_t *tvb, packet_info *pinfo, proto_tree *fh_tree, int fcs_decod
return next_tvb;
}
-gboolean
+static gboolean
capture_ppp_hdlc(const guchar *pd, int offset, int len, capture_packet_info_t *cpinfo, const union wtap_pseudo_header *pseudo_header _U_)
{
if (!BYTES_ARE_IN_FRAME(offset, len, 2))
diff --git a/epan/dissectors/packet-tr.c b/epan/dissectors/packet-tr.c
index 91883aad25..7a472c6ac9 100644
--- a/epan/dissectors/packet-tr.c
+++ b/epan/dissectors/packet-tr.c
@@ -247,7 +247,7 @@ int check_for_old_linux(const guchar * pd)
static void
add_ring_bridge_pairs(int rcf_len, tvbuff_t*, proto_tree *tree);
-gboolean
+static gboolean
capture_tr(const guchar *pd, int offset, int len, capture_packet_info_t *cpinfo, const union wtap_pseudo_header *pseudo_header _U_) {
int source_routed = 0;