aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-collectd.c
diff options
context:
space:
mode:
authorEvan Huus <eapache@gmail.com>2014-06-15 23:42:14 -0700
committerMichael Mann <mmann78@netscape.net>2014-06-16 17:26:25 +0000
commitde00c49bd84c853c9260f70cc5857c5a5ab6d3be (patch)
treed20495295746d9c1b0623b631931f538ee6d3581 /epan/dissectors/packet-collectd.c
parentb71b68cd637de5501de9d5684c79b6c8b5b2dfd3 (diff)
Convert a bunch of time_to_str functions to wmem
Change-Id: I24fe3cc4a3589dadc4528a77fe7ff13d06b1a983 Reviewed-on: https://code.wireshark.org/review/2245 Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan/dissectors/packet-collectd.c')
-rw-r--r--epan/dissectors/packet-collectd.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/epan/dissectors/packet-collectd.c b/epan/dissectors/packet-collectd.c
index 4ef7d0b78f..040384aefd 100644
--- a/epan/dissectors/packet-collectd.c
+++ b/epan/dissectors/packet-collectd.c
@@ -486,7 +486,7 @@ dissect_collectd_integer (tvbuff_t *tvb, packet_info *pinfo, gint type_hf,
gchar *strtime;
nstime = collectd_time_to_nstime (*ret_value);
- strtime = abs_time_to_ep_str (&nstime, ABSOLUTE_TIME_LOCAL, /* show_zone = */ TRUE);
+ strtime = abs_time_to_str (wmem_packet_scope(), &nstime, ABSOLUTE_TIME_LOCAL, /* show_zone = */ TRUE);
pi = proto_tree_add_text (tree_root, tvb, offset, length,
"collectd %s segment: %s",
val_to_str_const (type, part_names, "UNKNOWN"),
@@ -498,7 +498,7 @@ dissect_collectd_integer (tvbuff_t *tvb, packet_info *pinfo, gint type_hf,
gchar *strtime;
nstime = collectd_time_to_nstime (*ret_value);
- strtime = rel_time_to_ep_str (&nstime);
+ strtime = rel_time_to_str (wmem_packet_scope(), &nstime);
pi = proto_tree_add_text (tree_root, tvb, offset, length,
"collectd %s segment: %s",
val_to_str_const (type, part_names, "UNKNOWN"),