diff options
author | João Valverde <joao.valverde@tecnico.ulisboa.pt> | 2015-10-29 03:12:53 +0000 |
---|---|---|
committer | Michael Mann <mmann78@netscape.net> | 2015-11-03 12:20:34 +0000 |
commit | 3df2333155abf8fdfdedc51aca0fe962499f10b5 (patch) | |
tree | f241cb1777aaf99492eeb12c8365c96e705cfe4e /epan/dissectors/packet-dmp.c | |
parent | 8571dbb908e13d63a80e6465ea19566162dad9c1 (diff) |
Remaining ADDRESS macro to address function conversions
Change-Id: I8bc9af431e70243b05f4f0ce8c2b8ee451383788
Reviewed-on: https://code.wireshark.org/review/11463
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan/dissectors/packet-dmp.c')
-rw-r--r-- | epan/dissectors/packet-dmp.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/epan/dissectors/packet-dmp.c b/epan/dissectors/packet-dmp.c index 3b7fa2016d..985fb544c2 100644 --- a/epan/dissectors/packet-dmp.c +++ b/epan/dissectors/packet-dmp.c @@ -1401,8 +1401,8 @@ static void register_dmp_id (packet_info *pinfo, guint8 reason) { /* Try to match corresponding message */ dmp_key->id = (guint) dmp.subj_id; - WMEM_COPY_ADDRESS(wmem_file_scope(), &dmp_key->src, &(pinfo->dst)); - WMEM_COPY_ADDRESS(wmem_file_scope(), &dmp_key->dst, &(pinfo->src)); + copy_address_wmem(wmem_file_scope(), &dmp_key->src, &(pinfo->dst)); + copy_address_wmem(wmem_file_scope(), &dmp_key->dst, &(pinfo->src)); dmp_data = (dmp_id_val *) g_hash_table_lookup (dmp_id_hash_table, dmp_key); @@ -1419,12 +1419,12 @@ static void register_dmp_id (packet_info *pinfo, guint8 reason) if (dmp.msg_type == ACK) { dmp_key->id = (guint) dmp.subj_id; - WMEM_COPY_ADDRESS(wmem_file_scope(), &dmp_key->src, &(pinfo->dst)); - WMEM_COPY_ADDRESS(wmem_file_scope(), &dmp_key->dst, &(pinfo->src)); + copy_address_wmem(wmem_file_scope(), &dmp_key->src, &(pinfo->dst)); + copy_address_wmem(wmem_file_scope(), &dmp_key->dst, &(pinfo->src)); } else { dmp_key->id = (guint) dmp.msg_id; - WMEM_COPY_ADDRESS(wmem_file_scope(), &dmp_key->src, &(pinfo->src)); - WMEM_COPY_ADDRESS(wmem_file_scope(), &dmp_key->dst, &(pinfo->dst)); + copy_address_wmem(wmem_file_scope(), &dmp_key->src, &(pinfo->src)); + copy_address_wmem(wmem_file_scope(), &dmp_key->dst, &(pinfo->dst)); } dmp_data = (dmp_id_val *) g_hash_table_lookup (dmp_id_hash_table, dmp_key); |