diff options
| author | Bill Meier <wmeier@newsguy.com> | 2013-03-20 01:18:10 +0000 |
|---|---|---|
| committer | Bill Meier <wmeier@newsguy.com> | 2013-03-20 01:18:10 +0000 |
| commit | 0df5a9390d41149dfc87440d72e7669ba96748ec (patch) | |
| tree | 8accf4dfc301adfc679ed7f21b7123cb4b2c55f9 /epan/wmem/wmem_strutl.c | |
| parent | a43e5a7eb9fe1ad5a89e7cfd556a791a50fefee7 (diff) | |
From beroset:
remove C++ incompatibilities
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8416 attachment #10397
svn path=/trunk/; revision=48438
Diffstat (limited to 'epan/wmem/wmem_strutl.c')
| -rw-r--r-- | epan/wmem/wmem_strutl.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/epan/wmem/wmem_strutl.c b/epan/wmem/wmem_strutl.c index 958c1ebc09..99d13325e8 100644 --- a/epan/wmem/wmem_strutl.c +++ b/epan/wmem/wmem_strutl.c @@ -47,7 +47,7 @@ wmem_strdup(wmem_allocator_t *allocator, const gchar *src) len = strlen(src) + 1; /* +1 for the null-terminator */ - return memcpy(wmem_alloc(allocator, len), src, len); + return (gchar *)memcpy(wmem_alloc(allocator, len), src, len); } gchar * @@ -56,7 +56,7 @@ wmem_strndup(wmem_allocator_t *allocator, const gchar *src, const size_t len) gchar *dst; guint i; - dst = wmem_alloc(allocator, len+1); + dst = (gchar *)wmem_alloc(allocator, len+1); for (i=0; (i < len) && src[i]; i++) { dst[i] = src[i]; @@ -91,7 +91,7 @@ wmem_strdup_vprintf(wmem_allocator_t *allocator, const gchar *fmt, va_list ap) len = g_printf_string_upper_bound(fmt, ap); - dst = wmem_alloc(allocator, len+1); + dst = (gchar *)wmem_alloc(allocator, len+1); g_vsnprintf(dst, (gulong) len, fmt, ap2); va_end(ap2); |