aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-collectd.c
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2010-05-21 06:33:25 +0000
committerGuy Harris <guy@alum.mit.edu>2010-05-21 06:33:25 +0000
commit927b7da34668bc9c0b2dd4c339e45278fd109c77 (patch)
tree7017587d5ae078490ee9b3be8ec6551e7df71d13 /epan/dissectors/packet-collectd.c
parent4dcaf67f37f89d699a42089001f04c5daf9558e2 (diff)
Have abs_time_to_str() and abs_time_to_str_secs() take an additional
argument indicating whether to include the time zone in the string. If we're constructing a display filter, don't include the time zone, otherwise do. Fixes bug 4756. svn path=/trunk/; revision=32913
Diffstat (limited to 'epan/dissectors/packet-collectd.c')
-rw-r--r--epan/dissectors/packet-collectd.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/epan/dissectors/packet-collectd.c b/epan/dissectors/packet-collectd.c
index 649d6cb35b..a20eb2d6d5 100644
--- a/epan/dissectors/packet-collectd.c
+++ b/epan/dissectors/packet-collectd.c
@@ -1107,7 +1107,7 @@ dissect_collectd (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
pkt_errors++;
else
{
- vdispatch.time_str = abs_time_secs_to_str ((time_t) vdispatch.time, ABSOLUTE_TIME_LOCAL);
+ vdispatch.time_str = abs_time_secs_to_str ((time_t) vdispatch.time, ABSOLUTE_TIME_LOCAL, TRUE);
ndispatch.time = vdispatch.time;
ndispatch.time_str = vdispatch.time_str;