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 /epan/dissectors/packet-ccsds.c | |
| parent | 4dcaf67f37f89d699a42089001f04c5daf9558e2 (diff) | |
| download | wireshark-927b7da34668bc9c0b2dd4c339e45278fd109c77.tar.gz | |
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-ccsds.c')
| -rw-r--r-- | epan/dissectors/packet-ccsds.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/epan/dissectors/packet-ccsds.c b/epan/dissectors/packet-ccsds.c index a3f2b59378..72f8375e0b 100644 --- a/epan/dissectors/packet-ccsds.c +++ b/epan/dissectors/packet-ccsds.c @@ -264,7 +264,7 @@ static const char* embedded_time_to_string ( int coarse_time, int fine_time ) fraction = ( multiplier * ( (int)fine_time & 0xff ) ) / 256; t.nsecs = fraction*1000000; /* msecs to nsecs */ - return abs_time_to_str(&t, ABSOLUTE_TIME_DOY_UTC); + return abs_time_to_str(&t, ABSOLUTE_TIME_DOY_UTC, TRUE); } |