aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2006-02-14 08:34:20 +0000
committerGuy Harris <guy@alum.mit.edu>2006-02-14 08:34:20 +0000
commit58ed459c3384ab09acce58576b844152f9b50a70 (patch)
treeab7d84ea8bf79f6b41416e6f5b4b83156cb2f5a2
parent0980473a80330b49b6faec5cd5007980a5581d32 (diff)
Have the emem.c memdup routines accept and return "void *", as
"memcpy()" does; that eliminates some compiler warnings ("void *" is the type usually used for "generic pointer"). svn path=/trunk/; revision=17297
-rw-r--r--epan/emem.c4
-rw-r--r--epan/emem.h4
2 files changed, 4 insertions, 4 deletions
diff --git a/epan/emem.c b/epan/emem.c
index 3498aac645..3614b43dd3 100644
--- a/epan/emem.c
+++ b/epan/emem.c
@@ -333,7 +333,7 @@ gchar* ep_strndup(const gchar* src, size_t len) {
return dst;
}
-guint8* ep_memdup(const guint8* src, size_t len) {
+void* ep_memdup(const void* src, size_t len) {
return memcpy(ep_alloc(len), src, len);
}
@@ -475,7 +475,7 @@ gchar* se_strndup(const gchar* src, size_t len) {
return dst;
}
-guint8* se_memdup(const guint8* src, size_t len) {
+void* se_memdup(const void* src, size_t len) {
return memcpy(se_alloc(len), src, len);
}
diff --git a/epan/emem.h b/epan/emem.h
index 7287382b39..2e48ed93c5 100644
--- a/epan/emem.h
+++ b/epan/emem.h
@@ -59,7 +59,7 @@ gchar* ep_strdup(const gchar* src);
gchar* ep_strndup(const gchar* src, size_t len);
/* Duplicate a buffer with a packet lifetime scope */
-guint8* ep_memdup(const guint8* src, size_t len);
+void* ep_memdup(const void* src, size_t len);
/* Create a formatted string with a packet lifetime scope */
gchar* ep_strdup_vprintf(const gchar* fmt, va_list ap);
@@ -141,7 +141,7 @@ gchar* se_strdup(const gchar* src);
gchar* se_strndup(const gchar* src, size_t len);
/* Duplicate a buffer with a capture lifetime scope */
-guint8* se_memdup(const guint8* src, size_t len);
+void* se_memdup(const void* src, size_t len);
/* Create a formatted string with a capture lifetime scope */
gchar* se_strdup_vprintf(const gchar* fmt, va_list ap);