diff options
author | Evan Huus <eapache@gmail.com> | 2013-11-21 00:18:12 +0000 |
---|---|---|
committer | Evan Huus <eapache@gmail.com> | 2013-11-21 00:18:12 +0000 |
commit | 123caff957acab4bc08cc39ea336e51fb8aa607e (patch) | |
tree | f955944ff07fe4afca93661d6ba7bb06774bc8f7 /epan/dissectors/packet-xmpp-utils.c | |
parent | 50aa247c727bb3694c7ad00e910351a7f2681b51 (diff) |
Remove one accidentally remaining reference to emem in XMPP utils.
Kill a bunch of now-unused emem tree code.
svn path=/trunk/; revision=53458
Diffstat (limited to 'epan/dissectors/packet-xmpp-utils.c')
-rw-r--r-- | epan/dissectors/packet-xmpp-utils.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/epan/dissectors/packet-xmpp-utils.c b/epan/dissectors/packet-xmpp-utils.c index 564d21489c..332f26ce7a 100644 --- a/epan/dissectors/packet-xmpp-utils.c +++ b/epan/dissectors/packet-xmpp-utils.c @@ -57,7 +57,7 @@ xmpp_iq_reqresp_track(packet_info *pinfo, xmpp_element_t *packet, xmpp_conv_info id = wmem_strdup(wmem_packet_scope(), attr_id->value); if (!pinfo->fd->flags.visited) { - xmpp_trans = (xmpp_transaction_t *)wmem_tree_lookup_string(xmpp_info->req_resp, id, EMEM_TREE_STRING_NOCASE); + xmpp_trans = (xmpp_transaction_t *)wmem_tree_lookup_string(xmpp_info->req_resp, id, WMEM_TREE_STRING_NOCASE); if (xmpp_trans) { xmpp_trans->resp_frame = pinfo->fd->num; @@ -68,12 +68,12 @@ xmpp_iq_reqresp_track(packet_info *pinfo, xmpp_element_t *packet, xmpp_conv_info xmpp_trans->req_frame = pinfo->fd->num; xmpp_trans->resp_frame = 0; - wmem_tree_insert_string(xmpp_info->req_resp, se_id, (void *) xmpp_trans, EMEM_TREE_STRING_NOCASE); + wmem_tree_insert_string(xmpp_info->req_resp, se_id, (void *) xmpp_trans, WMEM_TREE_STRING_NOCASE); } } else { - wmem_tree_lookup_string(xmpp_info->req_resp, id, EMEM_TREE_STRING_NOCASE); + wmem_tree_lookup_string(xmpp_info->req_resp, id, WMEM_TREE_STRING_NOCASE); } } @@ -107,7 +107,7 @@ xmpp_jingle_session_track(packet_info *pinfo, xmpp_element_t *packet, xmpp_conv_ se_id = wmem_strdup(wmem_file_scope(), attr_id->value); se_sid = wmem_strdup(wmem_file_scope(), attr_sid->value); - wmem_tree_insert_string(xmpp_info->jingle_sessions, se_id, (void*) se_sid, EMEM_TREE_STRING_NOCASE); + wmem_tree_insert_string(xmpp_info->jingle_sessions, se_id, (void*) se_sid, WMEM_TREE_STRING_NOCASE); } } @@ -145,7 +145,7 @@ xmpp_gtalk_session_track(packet_info *pinfo, xmpp_element_t *packet, xmpp_conv_i se_id = wmem_strdup(wmem_file_scope(), attr_id->value); se_sid = wmem_strdup(wmem_file_scope(), attr_sid->value); - wmem_tree_insert_string(xmpp_info->gtalk_sessions, se_id, (void*) se_sid, EMEM_TREE_STRING_NOCASE); + wmem_tree_insert_string(xmpp_info->gtalk_sessions, se_id, (void*) se_sid, WMEM_TREE_STRING_NOCASE); } } @@ -186,7 +186,7 @@ xmpp_ibb_session_track(packet_info *pinfo, xmpp_element_t *packet, xmpp_conv_inf { se_id = wmem_strdup(wmem_file_scope(), attr_id->value); se_sid = wmem_strdup(wmem_file_scope(), attr_sid->value); - wmem_tree_insert_string(xmpp_info->ibb_sessions, se_id, (void*) se_sid, EMEM_TREE_STRING_NOCASE); + wmem_tree_insert_string(xmpp_info->ibb_sessions, se_id, (void*) se_sid, WMEM_TREE_STRING_NOCASE); } } } |