Use a readable name for the wmem callback test. Warn that reallocing memory

for which a callback is registered is also a fairly stupid thing to do.

svn path=/trunk/; revision=49354

2 files changed, 9 insertions, 8 deletions

diff --git a/doc/README.wmem b/doc/README.wmem
index 7d04c6fffe..31ebf1bf11 100644
--- a/doc/README.wmem
+++ b/doc/README.wmem
@@ -133,9 +133,10 @@ appropriate wmem pool.
 Also note that callback calling order is not defined, you cannot rely on a
 certain callback being called before or after another.
 
-WARNING: Manually freeing memory with wmem_free will NOT trigger any callbacks.
-         It is an error to call wmem_free on memory if you have a callback
-         registered to deal with the contents of a that memory.
+WARNING: Manually freeing or moving memory (with wmem_free or wmem_realloc)
+         will NOT trigger any callbacks. It is an error to call either of
+         those functions on memory if you have a callback registered to deal
+         with the contents of that memory.
 
 3. Usage for Producers
 
diff --git a/epan/wmem/wmem_test.c b/epan/wmem/wmem_test.c
index 228d83a884..fef6be5cb4 100644
--- a/epan/wmem/wmem_test.c
+++ b/epan/wmem/wmem_test.c
@@ -541,11 +541,11 @@ main(int argc, char **argv)
 {
     g_test_init(&argc, &argv, NULL);
 
-    g_test_add_func("/wmem/allocator/block",  wmem_test_allocator_block);
-    g_test_add_func("/wmem/allocator/simple", wmem_test_allocator_simple);
-    g_test_add_func("/wmem/allocator/strict", wmem_test_allocator_strict);
-    g_test_add_func("/wmem/allocator/times",  wmem_time_allocators);
-    g_test_add_func("/wmem/allocator/cbs",    wmem_test_allocator_callbacks);
+    g_test_add_func("/wmem/allocator/block",     wmem_test_allocator_block);
+    g_test_add_func("/wmem/allocator/simple",    wmem_test_allocator_simple);
+    g_test_add_func("/wmem/allocator/strict",    wmem_test_allocator_strict);
+    g_test_add_func("/wmem/allocator/times",     wmem_time_allocators);
+    g_test_add_func("/wmem/allocator/callbacks", wmem_test_allocator_callbacks);
 
     g_test_add_func("/wmem/utils/strings", wmem_test_strutls);