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/range.c | |
| parent | a43e5a7eb9fe1ad5a89e7cfd556a791a50fefee7 (diff) | |
| download | wireshark-0df5a9390d41149dfc87440d72e7669ba96748ec.tar.gz wireshark-0df5a9390d41149dfc87440d72e7669ba96748ec.tar.bz2 wireshark-0df5a9390d41149dfc87440d72e7669ba96748ec.zip | |
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/range.c')
| -rw-r--r-- | epan/range.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/epan/range.c b/epan/range.c index 81a1d0634e..6d692c6d6b 100644 --- a/epan/range.c +++ b/epan/range.c @@ -49,7 +49,7 @@ range_t *range_empty(void) { range_t *range; - range = g_malloc(RANGE_HDR_SIZE); + range = (range_t *)g_malloc(RANGE_HDR_SIZE); range->nranges = 0; return range; } @@ -109,7 +109,7 @@ range_convert_str_work(range_t **rangep, const gchar *es, guint32 max_value, return CVT_SYNTAX_ERROR; /* Allocate a range; this has room for one subrange. */ - range = g_malloc(RANGE_HDR_SIZE + sizeof (range_admin_t)); + range = (range_t *)g_malloc(RANGE_HDR_SIZE + sizeof (range_admin_t)); range->nranges = 0; nranges = 1; @@ -140,7 +140,7 @@ range_convert_str_work(range_t **rangep, const gchar *es, guint32 max_value, nranges = 4; else nranges += 4; - range = g_realloc(range, RANGE_HDR_SIZE + + range = (range_t *)g_realloc(range, RANGE_HDR_SIZE + nranges*sizeof (range_admin_t)); } @@ -358,7 +358,7 @@ range_copy(range_t *src) return NULL; range_size = RANGE_HDR_SIZE + src->nranges*sizeof (range_admin_t); - dst = g_malloc(range_size); + dst = (range_t *)g_malloc(range_size); memcpy(dst, src, range_size); return dst; } |