diff options
author | Guy Harris <guy@alum.mit.edu> | 2010-05-21 06:33:25 +0000 |
---|---|---|
committer | Guy Harris <guy@alum.mit.edu> | 2010-05-21 06:33:25 +0000 |
commit | 927b7da34668bc9c0b2dd4c339e45278fd109c77 (patch) | |
tree | 7017587d5ae078490ee9b3be8ec6551e7df71d13 /asn1/mms | |
parent | 4dcaf67f37f89d699a42089001f04c5daf9558e2 (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 'asn1/mms')
-rw-r--r-- | asn1/mms/mms.cnf | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/asn1/mms/mms.cnf b/asn1/mms/mms.cnf index 6976087af5..4447a01e1b 100644 --- a/asn1/mms/mms.cnf +++ b/asn1/mms/mms.cnf @@ -80,7 +80,7 @@ UtcTime TYPE = FT_STRING DISPLAY = BASE_NONE ts.secs = (days + 5113) * 86400 + milliseconds / 1000; ts.nsecs = (milliseconds %% 1000) * G_GINT64_CONSTANT(1000000U); - ptime = abs_time_to_str(&ts, ABSOLUTE_TIME_UTC); + ptime = abs_time_to_str(&ts, ABSOLUTE_TIME_UTC, TRUE); if(hf_index >= 0) { proto_tree_add_string(tree, hf_index, tvb, offset, len, ptime); @@ -134,7 +134,7 @@ UtcTime TYPE = FT_STRING DISPLAY = BASE_NONE ts.secs = seconds; ts.nsecs = nanoseconds; - ptime = abs_time_to_str(&ts, ABSOLUTE_TIME_UTC); + ptime = abs_time_to_str(&ts, ABSOLUTE_TIME_UTC, TRUE); if(hf_index >= 0) { |