Rename address_to_str() to ep_address_to_str() because:

1) This indicates that the string has ephemeral lifetime
2) More consistent with its existing seasonal counterpart, se_address_to_str().


git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@29747 f5534014-38df-0310-8fa8-9805f1628bb7

1 files changed, 12 insertions, 12 deletions

diff --git a/epan/dissectors/packet-jxta.c b/epan/dissectors/packet-jxta.c
index fa2a0c9be6..1d395c0268 100644
--- a/epan/dissectors/packet-jxta.c
+++ b/epan/dissectors/packet-jxta.c
@@ -608,8 +608,8 @@ static int dissect_jxta_stream(tvbuff_t * tvb, packet_info * pinfo, proto_tree *
         }
 
         /* g_message("%d Tpt %s:%d -> %s:%d tvb len=%d\n\t%s %d", pinfo->fd->num,
-                  address_to_str(&pinfo->src), pinfo->srcport,
-                  address_to_str(&pinfo->dst), pinfo->destport,
+                  ep_address_to_str(&pinfo->src), pinfo->srcport,
+                  ep_address_to_str(&pinfo->dst), pinfo->destport,
                   tvb_reported_length_remaining(tvb, 0),
                   content_type ? content_type : "[unknown content type]", (gint) content_length); */
 
@@ -642,14 +642,14 @@ static int dissect_jxta_stream(tvbuff_t * tvb, packet_info * pinfo, proto_tree *
             /* Use our source and destination addresses if we have them */
             if (NULL != peer_conversation) {
                 /* g_message("%d Tpt %s:%d -> %s:%d", pinfo->fd->num,
-                          address_to_str(&tpt_conv_data->initiator_tpt_address), tpt_conv_data->initiator_tpt_port,
-                          address_to_str(&tpt_conv_data->receiver_tpt_address), tpt_conv_data->receiver_tpt_port); */
+                          ep_address_to_str(&tpt_conv_data->initiator_tpt_address), tpt_conv_data->initiator_tpt_port,
+                          ep_address_to_str(&tpt_conv_data->receiver_tpt_address), tpt_conv_data->receiver_tpt_port); */
 
                 if (ADDRESSES_EQUAL(&pinfo->src, &tpt_conv_data->initiator_tpt_address)
                     && tpt_conv_data->initiator_tpt_port == pinfo->srcport) {
                     /* g_message("%d From initiator : %s -> %s ", pinfo->fd->num,
-                              address_to_str(&tpt_conv_data->initiator_address),
-                              address_to_str(&tpt_conv_data->receiver_address)); */
+                              ep_address_to_str(&tpt_conv_data->initiator_address),
+                              ep_address_to_str(&tpt_conv_data->receiver_address)); */
                     pinfo->src = tpt_conv_data->initiator_address;
                     pinfo->srcport = 0;
                     pinfo->dst = tpt_conv_data->receiver_address;
@@ -658,8 +658,8 @@ static int dissect_jxta_stream(tvbuff_t * tvb, packet_info * pinfo, proto_tree *
                 } else if (ADDRESSES_EQUAL(&pinfo->src, &tpt_conv_data->receiver_tpt_address) &&
                            tpt_conv_data->receiver_tpt_port == pinfo->srcport) {
                     /* g_message("%d From receiver : %s -> %s ", pinfo->fd->num,
-                              address_to_str(&tpt_conv_data->receiver_address),
-                              address_to_str(&tpt_conv_data->initiator_address)); */
+                              ep_address_to_str(&tpt_conv_data->receiver_address),
+                              ep_address_to_str(&tpt_conv_data->initiator_address)); */
                     pinfo->src = tpt_conv_data->receiver_address;
                     pinfo->srcport = 0;
                     pinfo->dst = tpt_conv_data->initiator_address;
@@ -667,8 +667,8 @@ static int dissect_jxta_stream(tvbuff_t * tvb, packet_info * pinfo, proto_tree *
                     pinfo->ptype = PT_NONE;
                 } else {
                     /* g_message("%d Nothing matches %s:%d -> %s:%d", pinfo->fd->num,
-                              address_to_str(&pinfo->src), pinfo->srcport,
-                              address_to_str(&pinfo->dst), pinfo->destport); */
+                              ep_address_to_str(&pinfo->src), pinfo->srcport,
+                              ep_address_to_str(&pinfo->dst), pinfo->destport); */
                 }
             }
 
@@ -1306,8 +1306,8 @@ static int dissect_jxta_message(tvbuff_t * tvb, packet_info * pinfo, proto_tree
         return -needed;
     }
 
-    src_addr = ep_strbuf_new_label(address_to_str(&pinfo->src));
-    dst_addr = ep_strbuf_new_label(address_to_str(&pinfo->dst));
+    src_addr = ep_strbuf_new_label(ep_address_to_str(&pinfo->src));
+    dst_addr = ep_strbuf_new_label(ep_address_to_str(&pinfo->dst));
 
     /* append the port if appropriate */
     if (PT_NONE != pinfo->ptype) {