aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoretxrab <etxrab@f5534014-38df-0310-8fa8-9805f1628bb7>2010-10-24 14:02:31 +0000
committeretxrab <etxrab@f5534014-38df-0310-8fa8-9805f1628bb7>2010-10-24 14:02:31 +0000
commita65222777a3d7e10dd63861eb301a36f737820de (patch)
treeeea9269ffaa3a4f393aa2ae9ce9f8b777507ea8d
parentd75fe1c6468cb9a948632fd8398b8af248b820ca (diff)
error: ‘ieee802154_short_addr_invalidate’ declared ‘static’ but never defined
error: ‘ieee802154_long_addr_invalidate’ declared ‘static’ but never defined git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@34629 f5534014-38df-0310-8fa8-9805f1628bb7
-rw-r--r--epan/dissectors/packet-ieee802154.c11
-rw-r--r--epan/dissectors/packet-ieee802154.h2
2 files changed, 9 insertions, 4 deletions
diff --git a/epan/dissectors/packet-ieee802154.c b/epan/dissectors/packet-ieee802154.c
index 24b5b63a0c..8a1d4f87e8 100644
--- a/epan/dissectors/packet-ieee802154.c
+++ b/epan/dissectors/packet-ieee802154.c
@@ -90,6 +90,11 @@
#include "packet-ieee802154.h"
#include "packet-frame.h" /* For Exception Handling */
+
+/* Forward declarations */
+static gboolean ieee802154_short_addr_invalidate(guint16, guint16, guint);
+static gboolean ieee802154_long_addr_invalidate(guint64, guint);
+
/* Dissection Options for dissect_ieee802154_common */
#define DISSECT_IEEE802154_OPTION_CC24xx 0x00000001 /* FCS field contains a TI CC24xx style FCS. */
#define DISSECT_IEEE802154_OPTION_LINUX 0x00000002 /* Addressing fields are padded DLT_IEEE802_15_4_LINUX, not implemented. */
@@ -2301,7 +2306,8 @@ ieee802154_map_rec *ieee802154_addr_update(ieee802154_addr_t *ieee802154_addr,
* FALSE - Couldn't find it
*---------------------------------------------------------------
*/
-gboolean ieee802154_short_addr_invalidate(guint16 short_addr, guint16 pan, guint fnum)
+static gboolean
+ieee802154_short_addr_invalidate(guint16 short_addr, guint16 pan, guint fnum)
{
ieee802154_short_addr addr16;
ieee802154_map_rec *map_rec;
@@ -2334,7 +2340,8 @@ gboolean ieee802154_short_addr_invalidate(guint16 short_addr, guint16 pan, guint
* FALSE - If record wasn't updated
*---------------------------------------------------------------
*/
-gboolean ieee802154_long_addr_invalidate(guint64 long_addr, guint fnum)
+static gboolean
+ieee802154_long_addr_invalidate(guint64 long_addr, guint fnum)
{
ieee802154_map_rec *map_rec;
diff --git a/epan/dissectors/packet-ieee802154.h b/epan/dissectors/packet-ieee802154.h
index a4a8c0624e..c106be5f38 100644
--- a/epan/dissectors/packet-ieee802154.h
+++ b/epan/dissectors/packet-ieee802154.h
@@ -243,7 +243,5 @@ extern ieee802154_map_rec *ieee802154_addr_update(ieee802154_addr_t *, guint16,
extern guint ieee802154_short_addr_hash(gconstpointer);
extern gboolean ieee802154_short_addr_equal(gconstpointer, gconstpointer);
-static gboolean ieee802154_short_addr_invalidate(guint16, guint16, guint);
-static gboolean ieee802154_long_addr_invalidate(guint64, guint);
#endif /* PACKET_IEEE802154_H */