aboutsummaryrefslogtreecommitdiffstats
path: root/epan
diff options
context:
space:
mode:
authorEvan Huus <eapache@gmail.com>2014-06-15 12:44:01 -0400
committerMichael Mann <mmann78@netscape.net>2014-06-16 15:19:48 +0000
commit39a14ab75fc04a5c7571276efc17df44c8039b22 (patch)
tree18fe8805d136bc74c198f7b33938fb7fe718808f /epan
parentdd596dbcfd2b387c4206c670b924268273a6521e (diff)
downloadwireshark-39a14ab75fc04a5c7571276efc17df44c8039b22.tar.gz
wireshark-39a14ab75fc04a5c7571276efc17df44c8039b22.tar.bz2
wireshark-39a14ab75fc04a5c7571276efc17df44c8039b22.zip
Remove now-unused functions.
Change-Id: Iecf230d493b31ecab25b33c67323987459b23bd7 Reviewed-on: https://code.wireshark.org/review/2242 Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan')
-rw-r--r--epan/emem.c12
-rw-r--r--epan/emem.h8
-rw-r--r--epan/uat.c12
-rw-r--r--epan/uat.h11
4 files changed, 1 insertions, 42 deletions
diff --git a/epan/emem.c b/epan/emem.c
index a30e6254f3..cd9e3f1978 100644
--- a/epan/emem.c
+++ b/epan/emem.c
@@ -966,12 +966,6 @@ ep_strdup(const gchar *src)
return emem_strdup(src, ep_alloc);
}
-gchar *
-se_strdup(const gchar *src)
-{
- return emem_strdup(src, se_alloc);
-}
-
static gchar *
emem_strndup(const gchar *src, size_t len, void *allocator(size_t))
{
@@ -1000,12 +994,6 @@ ep_memdup(const void* src, size_t len)
return memcpy(ep_alloc(len), src, len);
}
-void *
-se_memdup(const void* src, size_t len)
-{
- return memcpy(se_alloc(len), src, len);
-}
-
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 9b6031e5cd..2f3373aad9 100644
--- a/epan/emem.h
+++ b/epan/emem.h
@@ -120,14 +120,6 @@ WS_DLL_PUBLIC
void* se_alloc0(size_t size) G_GNUC_MALLOC;
#define se_new0(type) ((type*)se_alloc0(sizeof(type)))
-/** Duplicate a string with a capture lifetime scope */
-WS_DLL_PUBLIC
-gchar* se_strdup(const gchar* src) G_GNUC_MALLOC;
-
-/** Duplicate a buffer with a capture lifetime scope */
-WS_DLL_PUBLIC
-void* se_memdup(const void* src, size_t len) G_GNUC_MALLOC;
-
/* Create a formatted string with a capture lifetime scope */
WS_DLL_PUBLIC
gchar* se_strdup_printf(const gchar* fmt, ...)
diff --git a/epan/uat.c b/epan/uat.c
index 923e310b6c..48da1c214b 100644
--- a/epan/uat.c
+++ b/epan/uat.c
@@ -393,18 +393,6 @@ void uat_clear(uat_t* uat) {
*((uat)->nrows_p) = 0;
}
-void* uat_dup(uat_t* uat, guint* len_p) {
- guint size = (guint) (uat->record_size * uat->user_data->len);
- *len_p = size;
- return size ? g_memdup(uat->user_data->data,size) : NULL ;
-}
-
-void* uat_se_dup(uat_t* uat, guint* len_p) {
- guint size = (guint) (uat->record_size * uat->user_data->len);
- *len_p = (guint) size;
- return size ? se_memdup(uat->user_data->data,size) : NULL ;
-}
-
void uat_unload_all(void) {
guint i;
diff --git a/epan/uat.h b/epan/uat.h
index 3c8c6dda91..f018f2378a 100644
--- a/epan/uat.h
+++ b/epan/uat.h
@@ -54,7 +54,7 @@ extern "C" {
*
* UATs are meant for short tables of user data (passwords and such) there's
* no quick access, you must iterate through them each time to fetch the record
- * you are looking for. Use uat_dup() or uat_se_dup() if necessary.
+ * you are looking for.
*
* Only users via gui or editing the file can add/remove records your code cannot.
*/
@@ -299,15 +299,6 @@ gboolean uat_load_str(uat_t* uat_in, char* entry, char** err);
*/
uat_t *uat_find(gchar *name);
-/*
- * uat_dup()
- * uat_se_dup()
- * make a reliable copy of an uat for internal use,
- * so that pointers to records can be kept through calls.
- * return NULL on zero len.
- */
-void* uat_dup(uat_t*, guint* len_p); /* to be freed */
-void* uat_se_dup(uat_t*, guint* len_p);
WS_DLL_PUBLIC
uat_t* uat_get_table_by_name(const char* name);