aboutsummaryrefslogtreecommitdiffstats
path: root/epan/to_str.c
diff options
context:
space:
mode:
authorKovarththanan Rajaratnam <kovarththanan.rajaratnam@gmail.com>2009-09-06 14:25:47 +0000
committerKovarththanan Rajaratnam <kovarththanan.rajaratnam@gmail.com>2009-09-06 14:25:47 +0000
commit8c48c6835fbfada96d2197bcbc7a87023bfc8291 (patch)
tree2a60509a6637549f370b63ce3b27a3de8f9736d8 /epan/to_str.c
parentd6b920b8f6b22548e3828258ea11b2443af89ce4 (diff)
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(). svn path=/trunk/; revision=29747
Diffstat (limited to 'epan/to_str.c')
-rw-r--r--epan/to_str.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/epan/to_str.c b/epan/to_str.c
index 3769fb121e..2f69c34927 100644
--- a/epan/to_str.c
+++ b/epan/to_str.c
@@ -127,7 +127,7 @@ bytestring_to_str(const guint8 *ad, guint32 len, char punct) {
* for a string using a colon as the hex-digit separator.
*/
/* XXX FIXME
-remove this one later when every call has been converted to address_to_str()
+remove this one later when every call has been converted to ep_address_to_str()
*/
gchar *
ether_to_str(const guint8 *ad)
@@ -137,7 +137,7 @@ ether_to_str(const guint8 *ad)
/*
This function is very fast and this function is called a lot.
- XXX update the address_to_str stuff to use this function.
+ XXX update the ep_address_to_str stuff to use this function.
*/
const gchar *
ip_to_str(const guint8 *ad) {
@@ -150,7 +150,7 @@ ip_to_str(const guint8 *ad) {
/*
This function is very fast and this function is called a lot.
- XXX update the address_to_str stuff to use this function.
+ XXX update the ep_address_to_str stuff to use this function.
*/
static const char * const fast_strings[] = {
"0", "1", "2", "3", "4", "5", "6", "7",
@@ -228,7 +228,7 @@ ip_to_str_buf(const guint8 *ad, gchar *buf, int buf_len)
/* XXX FIXME
-remove this one later when every call has been converted to address_to_str()
+remove this one later when every call has been converted to ep_address_to_str()
*/
gchar *
ip6_to_str(const struct e_in6_addr *ad) {
@@ -739,7 +739,7 @@ rel_time_to_secs_str(nstime_t *rel_time)
/* XXX FIXME
-remove this one later when every call has been converted to address_to_str()
+remove this one later when every call has been converted to ep_address_to_str()
*/
gchar *
fc_to_str(const guint8 *ad)
@@ -956,7 +956,7 @@ decode_numeric_bitfield(guint32 val, guint32 mask, int width,
/* convert an address struct into a printable string */
gchar*
-address_to_str(const address *addr)
+ep_address_to_str(const address *addr)
{
gchar *str;
@@ -965,13 +965,13 @@ address_to_str(const address *addr)
return str;
}
-/* The called routines use ep_alloc:ed memory */
+/* The called routines use se_alloc'ed memory */
gchar*
se_address_to_str(const address *addr)
{
gchar *str;
- str = address_to_str(addr);
+ str = ep_address_to_str(addr);
return se_strdup(str);
}