aboutsummaryrefslogtreecommitdiffstats
path: root/epan/wmem
diff options
context:
space:
mode:
authorAnders Broman <anders.broman@ericsson.com>2013-12-20 06:30:13 +0000
committerAnders Broman <anders.broman@ericsson.com>2013-12-20 06:30:13 +0000
commit5fbfa6c351a5a3ca5934563647bac856192fd192 (patch)
tree965f6f4cd092d4079c2b5a1e4fe33fed4b6a8389 /epan/wmem
parentf4ef031335dd8237edd111f1254239a19345eb3a (diff)
Fix [-Wmissing-prototypes]
svn path=/trunk/; revision=54280
Diffstat (limited to 'epan/wmem')
-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
5 files changed, 6 insertions, 3 deletions
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))
{