aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--epan/addr_resolv.c2
-rw-r--r--epan/addr_resolv.h2
-rw-r--r--epan/dissectors/file-mp4.c3
-rw-r--r--epan/uat.c2
-rw-r--r--epan/wmem/wmem_allocator_block.c1
-rw-r--r--epan/wmem/wmem_allocator_simple.c1
-rw-r--r--epan/wmem/wmem_allocator_strict.c3
-rw-r--r--epan/wmem/wmem_test.c2
-rw-r--r--epan/wmem/wmem_tree.c2
-rw-r--r--plugins/ethercat/packet-ecatmb.c15
-rw-r--r--plugins/ethercat/packet-ioraw.c3
11 files changed, 24 insertions, 12 deletions
diff --git a/epan/addr_resolv.c b/epan/addr_resolv.c
index 0815e22802..15c4d694ba 100644
--- a/epan/addr_resolv.c
+++ b/epan/addr_resolv.c
@@ -1397,7 +1397,7 @@ add_manuf_name(const guint8 *addr, unsigned int mask, gchar *name)
} /* add_manuf_name */
- gchar *
+static gchar *
manuf_name_lookup(const guint8 *addr)
{
gint32 manuf_key = 0;
diff --git a/epan/addr_resolv.h b/epan/addr_resolv.h
index e4c6a6fe72..be20fe17a7 100644
--- a/epan/addr_resolv.h
+++ b/epan/addr_resolv.h
@@ -326,7 +326,7 @@ WS_DLL_PUBLIC
GHashTable *get_serv_port_hashtable(void);
WS_DLL_PUBLIC
-GHashTable *get_ipxnet_table(void);
+GHashTable *get_ipxnet_hash_table(void);
WS_DLL_PUBLIC
GHashTable *get_ipv4_hash_table(void);
diff --git a/epan/dissectors/file-mp4.c b/epan/dissectors/file-mp4.c
index add3cd93a0..a08d0886eb 100644
--- a/epan/dissectors/file-mp4.c
+++ b/epan/dissectors/file-mp4.c
@@ -39,6 +39,9 @@
#define MAKE_TYPE_VAL(a, b, c, d) (a)<<24 | (b)<<16 | (c)<<8 | (d)
+void proto_register_mp4(void);
+void proto_reg_handoff_mp4(void);
+
static int proto_mp4 = -1;
static gint ett_mp4 = -1;
diff --git a/epan/uat.c b/epan/uat.c
index 64a888e141..4e32f24ea3 100644
--- a/epan/uat.c
+++ b/epan/uat.c
@@ -415,7 +415,7 @@ void uat_unload_all(void) {
}
}
-void uat_cleanup(void) {
+static void uat_cleanup(void) {
while( all_uats->len ) {
uat_destroy((uat_t*)all_uats->pdata);
}
diff --git a/epan/wmem/wmem_allocator_block.c b/epan/wmem/wmem_allocator_block.c
index da9a58f552..29d5d42de3 100644
--- a/epan/wmem/wmem_allocator_block.c
+++ b/epan/wmem/wmem_allocator_block.c
@@ -30,6 +30,7 @@
#include "wmem_core.h"
#include "wmem_allocator.h"
+#include "wmem_allocator_block.h"
/* This has turned into a very interesting excercise in algorithms and data
* structures.
diff --git a/epan/wmem/wmem_allocator_simple.c b/epan/wmem/wmem_allocator_simple.c
index aa6547a02f..7e0d172210 100644
--- a/epan/wmem/wmem_allocator_simple.c
+++ b/epan/wmem/wmem_allocator_simple.c
@@ -31,6 +31,7 @@
#include "wmem_core.h"
#include "wmem_allocator.h"
+#include "wmem_allocator_simple.h"
/* In this trivial allocator, we just store a GHashTable of malloc()ed
* blocks in the private_data pointer. We could just set the private_data
diff --git a/epan/wmem/wmem_allocator_strict.c b/epan/wmem/wmem_allocator_strict.c
index a67720c7a4..bee9d298b4 100644
--- a/epan/wmem/wmem_allocator_strict.c
+++ b/epan/wmem/wmem_allocator_strict.c
@@ -31,6 +31,7 @@
#include "wmem_core.h"
#include "wmem_allocator.h"
+#include "wmem_allocator_strict.h"
/* In this allocator, we do everything we can to catch invalid memory accesses.
* This includes using canaries (what Valgrind calls redzones) and
@@ -189,7 +190,7 @@ wmem_strict_realloc(void *private_data, void *ptr, const size_t size)
return newblock->real_data;
}
-void
+static void
wmem_strict_check_canaries(wmem_allocator_t *allocator)
{
wmem_strict_allocator_t *private_allocator;
diff --git a/epan/wmem/wmem_test.c b/epan/wmem/wmem_test.c
index 4b502bb53e..00139ef4a7 100644
--- a/epan/wmem/wmem_test.c
+++ b/epan/wmem/wmem_test.c
@@ -62,7 +62,7 @@ wmem_test_rand_string(wmem_allocator_t *allocator, gint minlen, gint maxlen)
return str;
}
-int
+static int
wmem_test_compare_guint32(const void *a, const void *b)
{
guint32 l, r;
diff --git a/epan/wmem/wmem_tree.c b/epan/wmem/wmem_tree.c
index 9d17d9f580..271793633f 100644
--- a/epan/wmem/wmem_tree.c
+++ b/epan/wmem/wmem_tree.c
@@ -576,7 +576,7 @@ wmem_tree_insert32_array(wmem_tree_t *tree, wmem_tree_key_t *key, void *data)
wmem_tree_insert32(insert_tree, insert_key32, data);
}
-void *
+static void *
wmem_tree_lookup32_array_helper(wmem_tree_t *tree, wmem_tree_key_t *key,
void*(*helper)(wmem_tree_t*, guint32))
{
diff --git a/plugins/ethercat/packet-ecatmb.c b/plugins/ethercat/packet-ecatmb.c
index de4492b1b3..c4597b559e 100644
--- a/plugins/ethercat/packet-ecatmb.c
+++ b/plugins/ethercat/packet-ecatmb.c
@@ -39,6 +39,9 @@
#define BIT2BYTE(x) ((x+7)/8)
#define ENDOF(p) ((p)+1) /* pointer to end of *p */
+void proto_register_ecat_mailbox(void);
+void proto_reg_handoff_ecat_mailbox(void);
+
static dissector_handle_t eth_handle;
static dissector_handle_t ams_handle;
@@ -258,32 +261,32 @@ void init_mbx_header(PETHERCAT_MBOX_HEADER pMbox, tvbuff_t *tvb, gint offset)
pMbox->aControlUnion.Control = tvb_get_letohs(tvb, offset);
}
-void init_eoe_header(PETHERCAT_EOE_HEADER pEoE, tvbuff_t *tvb, gint offset)
+static void init_eoe_header(PETHERCAT_EOE_HEADER pEoE, tvbuff_t *tvb, gint offset)
{
pEoE->anEoeHeaderInfoUnion.Info = tvb_get_letohs(tvb, offset); offset+=(int)sizeof(guint16);
pEoE->anEoeHeaderDataUnion.Result = tvb_get_letohs(tvb, offset);
}
-void init_foe_header(PETHERCAT_FOE_HEADER pFoE, tvbuff_t *tvb, gint offset)
+static void init_foe_header(PETHERCAT_FOE_HEADER pFoE, tvbuff_t *tvb, gint offset)
{
pFoE->OpMode = tvb_get_guint8(tvb, offset++);
pFoE->Reserved1 = tvb_get_guint8(tvb, offset++);
pFoE->aFoeHeaderDataUnion.FileLength = tvb_get_letohl(tvb, offset);
}
-void init_soe_header(PETHERCAT_SOE_HEADER pSoE, tvbuff_t *tvb, gint offset)
+static void init_soe_header(PETHERCAT_SOE_HEADER pSoE, tvbuff_t *tvb, gint offset)
{
pSoE->anSoeHeaderControlUnion.v2.Control = tvb_get_guint8(tvb, offset++);
pSoE->anSoeHeaderControlUnion.v2.Element = tvb_get_guint8(tvb, offset++);
pSoE->anSoeHeaderDataUnion.FragmentsLeft = tvb_get_letohs(tvb, offset);
}
-void init_coe_header(PETHERCAT_COE_HEADER pCoE, tvbuff_t *tvb, gint offset)
+static void init_coe_header(PETHERCAT_COE_HEADER pCoE, tvbuff_t *tvb, gint offset)
{
pCoE->header = tvb_get_letohs(tvb, offset);
}
-void init_sdo_header(PETHERCAT_SDO_HEADER pSdo, tvbuff_t *tvb, gint offset)
+static void init_sdo_header(PETHERCAT_SDO_HEADER pSdo, tvbuff_t *tvb, gint offset)
{
pSdo->anSdoHeaderUnion.CS = tvb_get_guint8(tvb, offset++);
pSdo->Index = tvb_get_letohs(tvb, offset);offset+=(int)sizeof(guint16);
@@ -291,7 +294,7 @@ void init_sdo_header(PETHERCAT_SDO_HEADER pSdo, tvbuff_t *tvb, gint offset)
pSdo->Data = tvb_get_letohl(tvb, offset);
}
-void init_sdo_info_header(PETHERCAT_SDO_INFO_HEADER pInfo, tvbuff_t *tvb, gint offset)
+static void init_sdo_info_header(PETHERCAT_SDO_INFO_HEADER pInfo, tvbuff_t *tvb, gint offset)
{
pInfo->anSdoControlUnion.Control = tvb_get_guint8(tvb, offset++);
pInfo->Reserved = tvb_get_guint8(tvb, offset);
diff --git a/plugins/ethercat/packet-ioraw.c b/plugins/ethercat/packet-ioraw.c
index 94f8bcb378..b04806d8ad 100644
--- a/plugins/ethercat/packet-ioraw.c
+++ b/plugins/ethercat/packet-ioraw.c
@@ -34,6 +34,9 @@
#include "packet-ioraw.h"
+void proto_register_ioraw(void);
+void proto_reg_handoff_ioraw(void);
+
/* Define the ioraw proto */
int proto_ioraw = -1;
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-05 09:52:15 +0000