Eliminate ep_strdup(), as it's no longer used.

Also, remove some no-longer-existent functions from checkAPIs.pl.

Change-Id: I2bf11e3ec03a34f9e89d58d560e340d76fd3ddc1
Reviewed-on: https://code.wireshark.org/review/6645
Reviewed-by: Guy Harris <guy@alum.mit.edu>

diff --git a/debian/libwireshark0.symbols b/debian/libwireshark0.symbols
index 60c6aae1d01dbb75fdf2f1db7c3a1b7a3d0f8534..4615911cf2b651c4a36795b376bf7580aa2f0c60 100644 (file)
--- a/debian/libwireshark0.symbols
+++ b/debian/libwireshark0.symbols
@@ -439,7 +439,6 @@ libwireshark.so.0 libwireshark0 #MINVER#
  empty_tcp_stream@Base 1.9.1
  ep_alloc0@Base 1.9.1
  ep_alloc@Base 1.9.1
- ep_strdup@Base 1.9.1
  ep_strdup_printf@Base 1.9.1
  epan_cleanup@Base 1.9.1
  epan_dissect_cleanup@Base 1.9.1

diff --git a/epan/emem.c b/epan/emem.c
index c0332b14342c49504a76c19858f3f66734826cdf..d86fb7135c2feb694bdb09c872622ba3baa136ab 100644 (file)
--- a/epan/emem.c
+++ b/epan/emem.c
@@ -690,31 +690,6 @@ ep_alloc0(size_t size)
        return memset(ep_alloc(size),'\0',size);
 }
 
-static gchar *
-emem_strdup(const gchar *src, void *allocator(size_t))
-{
-       guint len;
-       gchar *dst;
-
-       /* If str is NULL, just return the string "<NULL>" so that the callers don't
-        * have to bother checking it.
-        */
-       if(!src)
-               src = "<NULL>";
-
-       len = (guint) strlen(src);
-       dst = (gchar *)memcpy(allocator(len+1), src, len+1);
-
-       return dst;
-}
-
-gchar *
-ep_strdup(const gchar *src)
-{
-       return emem_strdup(src, ep_alloc);
-}
-
-
 static gchar *
 emem_strdup_vprintf(const gchar *fmt, va_list ap, void *allocator(size_t))
 {

diff --git a/epan/emem.h b/epan/emem.h
index 2c84bf8bb9033aedf999f98df79cfdff53cea14f..4e790eda1f76e6c1efee9bc9f918f393629b0e6d 100644 (file)
--- a/epan/emem.h
+++ b/epan/emem.h
@@ -59,10 +59,6 @@ void *ep_alloc(size_t size) G_GNUC_MALLOC;
 WS_DLL_PUBLIC
 void* ep_alloc0(size_t size) G_GNUC_MALLOC;
 
-/** Duplicate a string with a packet lifetime scope */
-WS_DLL_PUBLIC
-gchar* ep_strdup(const gchar* src) G_GNUC_MALLOC;
-
 /** Create a formatted string with a packet lifetime scope */
 WS_DLL_PUBLIC
 gchar* ep_strdup_printf(const gchar* fmt, ...)

diff --git a/tools/checkAPIs.pl b/tools/checkAPIs.pl
index 94843572a680ce6de8e80667d84af04615113352..c4f6d2f2f47f9f7f78a985d69d9987a83ad36831 100755 (executable)
--- a/tools/checkAPIs.pl
+++ b/tools/checkAPIs.pl
@@ -154,24 +154,7 @@ my %APIs = (
                 # wmem calls should replace all emem calls (see doc/README.wmem)
                 'ep_alloc',
                 'ep_alloc0',
-                'ep_strdup',
                 'ep_strdup_printf',
-                'ep_alloc_array',
-                'ep_alloc_array0',
-                'ep_stack_new',
-                'ep_stack_push',
-                'ep_stack_pop',
-                'ep_stack_peek',
-                'emem_tree_insert32',
-                'emem_tree_lookup32',
-                'emem_tree_lookup32_le',
-                'emem_tree_insert32_array',
-                'emem_tree_lookup32_array',
-                'emem_tree_lookup32_array_le',
-                'emem_tree_insert_string',
-                'emem_tree_lookup_string',
-                'emem_tree_foreach',
-                'emem_print_tree',
                 # Locale-unsafe APIs
                 # These may have unexpected behaviors in some locales (e.g.,
                 # "I" isn't always the upper-case form of "i", and "i" isn't