More name changes.

Add ep_ to routines that may return ephemeral strings.

Change "get_XXX" to "XXX_to_display" if the routine returns a formatted
string if it can't get a name.

Change-Id: Ia0e82784349752cf4285bf82788316c9588fdd88
Reviewed-on: https://code.wireshark.org/review/1217
Reviewed-by: Guy Harris <guy@alum.mit.edu>

1 files changed, 10 insertions, 10 deletions

diff --git a/epan/dissectors/packet-zbee-zdp-binding.c b/epan/dissectors/packet-zbee-zdp-binding.c
index 1ebe881467..1271dee0b9 100644
--- a/epan/dissectors/packet-zbee-zdp-binding.c
+++ b/epan/dissectors/packet-zbee-zdp-binding.c
@@ -67,7 +67,7 @@ zdp_parse_bind_table_entry(proto_tree *tree, tvbuff_t *tvb, guint *offset, guint
 
     /* Add the source address. */
     src64 = tvb_get_letoh64(tvb, *offset + len);
-    if (tree) ti = proto_tree_add_text(tree, tvb, *offset, 0, "Bind {Src: %s", get_eui64_name(src64));
+    if (tree) ti = proto_tree_add_text(tree, tvb, *offset, 0, "Bind {Src: %s", ep_eui64_to_display(src64));
     len += (int)sizeof(guint64);
 
     /* Add the source endpoint. */
@@ -104,7 +104,7 @@ zdp_parse_bind_table_entry(proto_tree *tree, tvbuff_t *tvb, guint *offset, guint
     }
     else if (mode == ZBEE_ZDP_ADDR_MODE_UNICAST) {
         dst64 = tvb_get_letoh64(tvb, *offset + len);
-        if (tree) proto_item_append_text(ti, ", Dst: %s", get_eui64_name(dst64));
+        if (tree) proto_item_append_text(ti, ", Dst: %s", ep_eui64_to_display(dst64));
         len += (int)sizeof(guint64);
 
         dst_ep = tvb_get_guint8(tvb, *offset + len);
@@ -178,7 +178,7 @@ dissect_zbee_zdp_req_end_device_bind(tvbuff_t *tvb, packet_info *pinfo, proto_tr
     for (i=0; i<out_count; i++) zbee_parse_uint(field_tree, hf_zbee_zdp_out_cluster, tvb, &offset, sizeof_cluster, NULL);
 
     if (version >= ZBEE_VERSION_2007) {
-        zbee_append_info(tree, pinfo, " Src: %s", get_eui64_name(ext_addr));
+        zbee_append_info(tree, pinfo, " Src: %s", ep_eui64_to_display(ext_addr));
     }
     zbee_append_info(tree, pinfo, ", Target: 0x%04x", target);
 
@@ -239,7 +239,7 @@ dissect_zbee_zdp_req_bind(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, g
     }
 
     if (version >= ZBEE_VERSION_2007) {
-        zbee_append_info(tree, pinfo, " Src: %s", get_eui64_name(src64));
+        zbee_append_info(tree, pinfo, " Src: %s", ep_eui64_to_display(src64));
     }
     if (dst_mode == ZBEE_ZDP_ADDR_MODE_GROUP) {
         zbee_append_info(tree, pinfo, ", Dst: 0x%04x", dst);
@@ -305,7 +305,7 @@ dissect_zbee_zdp_req_unbind(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
     }
 
     if (version >= ZBEE_VERSION_2007) {
-        zbee_append_info(tree, pinfo, " Src: %s", get_eui64_name(src64));
+        zbee_append_info(tree, pinfo, " Src: %s", ep_eui64_to_display(src64));
     }
     if (dst_mode == ZBEE_ZDP_ADDR_MODE_GROUP) {
         zbee_append_info(tree, pinfo, ", Dst: 0x%04x", dst);
@@ -340,7 +340,7 @@ dissect_zbee_zdp_req_bind_register(tvbuff_t *tvb, packet_info *pinfo, proto_tree
 
     ext_addr = zbee_parse_eui64(tree, hf_zbee_zdp_ext_addr, tvb, &offset, (int)sizeof(guint64), NULL);
 
-    zbee_append_info(tree, pinfo, ", Device: %s", get_eui64_name(ext_addr));
+    zbee_append_info(tree, pinfo, ", Device: %s", ep_eui64_to_display(ext_addr));
 
     /* Dump any leftover bytes. */
     zdp_dump_excess(tvb, offset, pinfo, tree);
@@ -374,8 +374,8 @@ dissect_zbee_zdp_req_replace_device(tvbuff_t *tvb, packet_info *pinfo, proto_tre
     new_addr = zbee_parse_eui64(tree, hf_zbee_zdp_replacement, tvb, &offset, (int)sizeof(guint64), NULL);
     /*new_ep   =*/ zbee_parse_uint(tree, hf_zbee_zdp_replacement_ep, tvb, &offset, (int)sizeof(guint8), NULL);
 
-    zbee_append_info(tree, pinfo, ", Device: %s", get_eui64_name(ext_addr));
-    zbee_append_info(tree, pinfo, ", Replacement: %s", get_eui64_name(new_addr));
+    zbee_append_info(tree, pinfo, ", Device: %s", ep_eui64_to_display(ext_addr));
+    zbee_append_info(tree, pinfo, ", Replacement: %s", ep_eui64_to_display(new_addr));
 
     /* Dump any leftover bytes. */
     zdp_dump_excess(tvb, offset, pinfo, tree);
@@ -425,7 +425,7 @@ dissect_zbee_zdp_req_store_bak_bind_entry(tvbuff_t *tvb, packet_info *pinfo, pro
     }
     else if (tree) proto_item_append_text(ti, " (Reserved)");
 
-    zbee_append_info(tree, pinfo, ", Src: %s", get_eui64_name(src64));
+    zbee_append_info(tree, pinfo, ", Src: %s", ep_eui64_to_display(src64));
     zbee_append_info(tree, pinfo, ", Src Endpoint: %d", src_ep);
     zbee_append_info(tree, pinfo, ", Cluster: %d", cluster);
 
@@ -477,7 +477,7 @@ dissect_zbee_zdp_req_remove_bak_bind_entry(tvbuff_t *tvb, packet_info *pinfo, pr
     }
     else if (tree) proto_item_append_text(ti, " (Reserved)");
 
-    zbee_append_info(tree, pinfo, ", Src: %s", get_eui64_name(src64));
+    zbee_append_info(tree, pinfo, ", Src: %s", ep_eui64_to_display(src64));
     zbee_append_info(tree, pinfo, ", Src Endpoint: %d", src_ep);
     zbee_append_info(tree, pinfo, ", Cluster: %d", cluster);