diff options
| author | Anders Broman <anders.broman@ericsson.com> | 2013-03-19 20:00:52 +0000 |
|---|---|---|
| committer | Anders Broman <anders.broman@ericsson.com> | 2013-03-19 20:00:52 +0000 |
| commit | 6bde91807842874d396f80faf5653e5403c249dc (patch) | |
| tree | 8dc51d6ec7d1ecb0e5d6f8bed87a43ba01fc10a7 /epan/dissectors/packet-gsm_sms.c | |
| parent | 3eb06be97d520daef0bad19bf9c261b01abdc66d (diff) | |
From beroset:
remove C++ incompatibilities
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8416
svn path=/trunk/; revision=48426
Diffstat (limited to 'epan/dissectors/packet-gsm_sms.c')
| -rw-r--r-- | epan/dissectors/packet-gsm_sms.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/epan/dissectors/packet-gsm_sms.c b/epan/dissectors/packet-gsm_sms.c index 38a7eb12fb..ba4a91beae 100644 --- a/epan/dissectors/packet-gsm_sms.c +++ b/epan/dissectors/packet-gsm_sms.c @@ -439,7 +439,7 @@ dis_field_addr(tvbuff_t *tvb, proto_tree *tree, guint32 *offset_p, const gchar * addrstr = gsm_sms_chars_to_utf8(addrbuf, i); break; default: - addrstr = ep_alloc(numdigocts*2 + 1); + addrstr = (gchar *)ep_alloc(numdigocts*2 + 1); for (i = 0; i < numdigocts; i++) { oct = tvb_get_guint8(tvb, offset + i); @@ -1748,7 +1748,7 @@ gsm_sms_chars_to_utf8(const unsigned char* src, int len) } /* Now allocate a buffer for the output string and fill it in */ - outbuf = ep_alloc(outlen + 1); + outbuf = (gchar *)ep_alloc(outlen + 1); for (i = 0, j = 0; j < len; j++) { if (char_is_escape(src[j])) { @@ -2703,7 +2703,7 @@ dis_field_ud(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint32 length, gb } /* Store udl and length for later decoding of reassembled SMS */ - p_frag_params = se_alloc0(sizeof(sm_fragment_params)); + p_frag_params = se_new0(sm_fragment_params); p_frag_params->udl = udl; p_frag_params->length = length; g_hash_table_insert(g_sm_fragment_params_table, |