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/sigcomp_state_hdlr.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/sigcomp_state_hdlr.c')
| -rw-r--r-- | epan/sigcomp_state_hdlr.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/epan/sigcomp_state_hdlr.c b/epan/sigcomp_state_hdlr.c index 612b5de6b9..4a9887d801 100644 --- a/epan/sigcomp_state_hdlr.c +++ b/epan/sigcomp_state_hdlr.c @@ -628,7 +628,7 @@ sigcomp_init_udvm(void){ /* * Store static dictionaries in hash table */ - sip_sdp_buff = g_malloc(SIP_SDP_STATE_LENGTH + 8); + sip_sdp_buff = (guint8 *)g_malloc(SIP_SDP_STATE_LENGTH + 8); partial_state_str = bytes_to_str(sip_sdp_state_identifier, 6); @@ -652,7 +652,7 @@ sigcomp_init_udvm(void){ * g_warning("g_hash_table_insert = 0x%x",sip_sdp_buff); */ - presence_buff = g_malloc(PRESENCE_STATE_LENGTH + 8); + presence_buff = (guint8 *)g_malloc(PRESENCE_STATE_LENGTH + 8); partial_state_str = bytes_to_str(presence_state_identifier, 6); @@ -713,7 +713,7 @@ int udvm_state_access(tvbuff_t *tvb, proto_tree *tree,guint8 *buff,guint16 p_id_ * g_warning("g_hash_table_lookup = 0x%x",state_buff); * g_warning("State Access: partial state =%s",partial_state_str); */ - state_buff = g_hash_table_lookup(state_buffer_table, partial_state_str); + state_buff = (guint8 *)g_hash_table_lookup(state_buffer_table, partial_state_str); if ( state_buff == NULL ){ result_code = 2; /* No state match */ return result_code; @@ -820,7 +820,7 @@ void udvm_state_create(guint8 *state_buff,guint8 *state_identifier,guint16 p_id_ } partial_state_str = bytes_to_str(partial_state, p_id_length); - dummy_buff = g_hash_table_lookup(state_buffer_table, partial_state_str); + dummy_buff = (gchar *)g_hash_table_lookup(state_buffer_table, partial_state_str); if ( dummy_buff == NULL ){ g_hash_table_insert(state_buffer_table, g_strdup(partial_state_str), state_buff); }else{ |