Remove old (2009) and no-longer-necessary compatibility macro.

svn path=/trunk/; revision=53527

diff --git a/epan/address_to_str.c b/epan/address_to_str.c
index 1c444568e6e5d560044695e48e5d2c23ca59b22e..5fefbcd80c6c6f314ccb3de2374cb17b53da1a79 100644 (file)
--- a/epan/address_to_str.c
+++ b/epan/address_to_str.c
@@ -489,7 +489,7 @@ get_ax25_name(const guint8 *ad)
     addr.len  = 7;
     addr.data = ad;
 
-    return address_to_str( &addr );
+    return ep_address_to_str( &addr );
 }
 
 /*XXX FIXME the code below may be called very very frequently in the future.

diff --git a/epan/dissectors/packet-bacapp.c b/epan/dissectors/packet-bacapp.c
index 662d4158a48dcaa71656e2bc800283a93c17ff74..6d3db6ebe46d6061699219f660e0f57d0058600d 100644 (file)
--- a/epan/dissectors/packet-bacapp.c
+++ b/epan/dissectors/packet-bacapp.c
@@ -4854,8 +4854,8 @@ bacapp_stats_tree_packet(stats_tree* st, packet_info* pinfo, epan_dissect_t* edt
     gchar *srcstr;
     const bacapp_info_value_t *binfo = (const bacapp_info_value_t *)p;
 
-    srcstr = wmem_strconcat(wmem_packet_scope(), "Src: ", address_to_str(&pinfo->src), NULL);
-    dststr = wmem_strconcat(wmem_packet_scope(), "Dst: ", address_to_str(&pinfo->dst), NULL);
+    srcstr = wmem_strconcat(wmem_packet_scope(), "Src: ", ep_address_to_str(&pinfo->src), NULL);
+    dststr = wmem_strconcat(wmem_packet_scope(), "Dst: ", ep_address_to_str(&pinfo->dst), NULL);
 
     tick_stat_node(st, st_str_packets_by_ip, 0, TRUE);
     packets_for_this_dst = tick_stat_node(st, st_str_packets_by_ip_dst, st_node_packets_by_ip, TRUE);
@@ -4900,8 +4900,8 @@ bacapp_stats_tree_service(stats_tree* st, packet_info* pinfo, epan_dissect_t* ed
 
     const bacapp_info_value_t *binfo = (const bacapp_info_value_t *)p;
 
-    srcstr = wmem_strconcat(wmem_packet_scope(), "Src: ", address_to_str(&pinfo->src), NULL);
-    dststr = wmem_strconcat(wmem_packet_scope(), "Dst: ", address_to_str(&pinfo->dst), NULL);
+    srcstr = wmem_strconcat(wmem_packet_scope(), "Src: ", ep_address_to_str(&pinfo->src), NULL);
+    dststr = wmem_strconcat(wmem_packet_scope(), "Dst: ", ep_address_to_str(&pinfo->dst), NULL);
 
     tick_stat_node(st, st_str_packets_by_service, 0, TRUE);
     if (binfo->service_type) {
@@ -4938,8 +4938,8 @@ bacapp_stats_tree_objectid(stats_tree* st, packet_info* pinfo, epan_dissect_t* e
     gchar *srcstr;
     const bacapp_info_value_t *binfo = (const bacapp_info_value_t *)p;
 
-    srcstr = wmem_strconcat(wmem_packet_scope(), "Src: ", address_to_str(&pinfo->src), NULL);
-    dststr = wmem_strconcat(wmem_packet_scope(), "Dst: ", address_to_str(&pinfo->dst), NULL);
+    srcstr = wmem_strconcat(wmem_packet_scope(), "Src: ", ep_address_to_str(&pinfo->src), NULL);
+    dststr = wmem_strconcat(wmem_packet_scope(), "Dst: ", ep_address_to_str(&pinfo->dst), NULL);
 
     tick_stat_node(st, st_str_packets_by_objectid, 0, TRUE);
     if (binfo->object_ident) {
@@ -4976,8 +4976,8 @@ bacapp_stats_tree_instanceid(stats_tree* st, packet_info* pinfo, epan_dissect_t*
     gchar *srcstr;
     const bacapp_info_value_t *binfo = (const bacapp_info_value_t *)p;
 
-    srcstr = wmem_strconcat(wmem_packet_scope(), "Src: ", address_to_str(&pinfo->src), NULL);
-    dststr = wmem_strconcat(wmem_packet_scope(), "Dst: ", address_to_str(&pinfo->dst), NULL);
+    srcstr = wmem_strconcat(wmem_packet_scope(), "Src: ", ep_address_to_str(&pinfo->src), NULL);
+    dststr = wmem_strconcat(wmem_packet_scope(), "Dst: ", ep_address_to_str(&pinfo->dst), NULL);
 
     tick_stat_node(st, st_str_packets_by_instanceid, 0, TRUE);
     if (binfo->object_ident) {

diff --git a/epan/dissectors/packet-sua.c b/epan/dissectors/packet-sua.c
index 0ca45a16daba3a830514a92e509e5f8e5d27fbf7..9645d542d8fb5be23dda6ead10dd6f559b607968 100644 (file)
--- a/epan/dissectors/packet-sua.c
+++ b/epan/dissectors/packet-sua.c
@@ -433,8 +433,8 @@ sua_assoc(packet_info* pinfo, address* opc, address* dpc, guint src_rn, guint ds
             return &no_sua_assoc;
     }
 
-    opck = opc->type == AT_SS7PC ? mtp3_pc_hash((mtp3_addr_pc_t *)opc->data) : g_str_hash(address_to_str(opc));
-    dpck = dpc->type == AT_SS7PC ? mtp3_pc_hash((mtp3_addr_pc_t *)dpc->data) : g_str_hash(address_to_str(dpc));
+    opck = opc->type == AT_SS7PC ? mtp3_pc_hash((mtp3_addr_pc_t *)opc->data) : g_str_hash(ep_address_to_str(opc));
+    dpck = dpc->type == AT_SS7PC ? mtp3_pc_hash((mtp3_addr_pc_t *)dpc->data) : g_str_hash(ep_address_to_str(dpc));
 
     switch (message_type) {
         case MESSAGE_TYPE_CORE:

diff --git a/epan/proto.c b/epan/proto.c
index dfec1e5cb2b3d5e84ea822e266434821ba77a661..f5c1f4205e12310a968d2a00b57fd24f6dea3b4c 100644 (file)
--- a/epan/proto.c
+++ b/epan/proto.c
@@ -5355,7 +5355,7 @@ proto_item_fill_label(field_info *fi, gchar *label_str)
 
                        g_snprintf(label_str, ITEM_LABEL_LENGTH,
                                   "%s: %s", hfinfo->name,
-                                  address_to_str( &addr ));
+                                  ep_address_to_str( &addr ));
                        break;
 
                case FT_ETHER:

diff --git a/epan/to_str.h b/epan/to_str.h
index 6790502c97aefd25c899b5aaf923f00e35324679..7e41394337b8f9a4780dbd1d5bba4eb748af7e95 100644 (file)
--- a/epan/to_str.h
+++ b/epan/to_str.h
@@ -50,8 +50,6 @@ extern "C" {
 
 struct     e_in6_addr;
 
-/* !!Deprecated!! - use ep_address_to_str() */
-#define address_to_str ep_address_to_str
 WS_DLL_PUBLIC gchar*   ep_address_to_str(const address *);
 extern gchar*  se_address_to_str(const address *);
 WS_DLL_PUBLIC void     address_to_str_buf(const address *addr, gchar *buf, int buf_len);