aboutsummaryrefslogtreecommitdiffstats
path: root/epan/proto.c
diff options
context:
space:
mode:
authorGuy Harris <gharris@sonic.net>2024-05-07 09:59:27 -0700
committerGuy Harris <gharris@sonic.net>2024-05-07 09:59:27 -0700
commit7178f568259545687fd050bc6af95a0edcc7aa9a (patch)
tree79c0a7f00f1fa62a783481426b64d8b9a9af6fb5 /epan/proto.c
parent0a94c0b2cac6cbaa25d96cb2638bb4dd38d89b47 (diff)
Rename ENC_TIME_CLASSIC_MAC_OS_SECS to ENC_TIME_MP4_SECS.
The time in MP4 files happens to be represented as seconds since the classic Mac OS epoch; nothing else currently uses that. Rename ENC_TIME_CLASSIC_MAC_OS_SECS to ENC_TIME_MP4_SECS to make it clearer what's being done, but leave ENC_TIME_CLASSIC_MAC_OS_SECS around for backwards compatibility. If any other file formats or protocols use that epoch, we can make ENC_TIME_CLASSIC_MAC_OS_SECS a separate value (so that dissectors using an unsupported size with that value will report an issue with classic Mac OS times, not an issue with MP4 times) or introduce other values using the same epoch (for the same reason). Clean up some code formatting issues while we're at it.
Diffstat (limited to 'epan/proto.c')
-rw-r--r--epan/proto.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/epan/proto.c b/epan/proto.c
index d0993026b9..10946970d9 100644
--- a/epan/proto.c
+++ b/epan/proto.c
@@ -2524,6 +2524,7 @@ get_time_value(proto_tree *tree, tvbuff_t *tvb, const gint start,
report_type_length_mismatch(tree, "an NTP seconds-only time stamp", length, (length < 4));
}
break;
+
case ENC_TIME_MSEC_NTP | ENC_BIG_ENDIAN:
/*
* Milliseconds, 6 to 8 bytes.
@@ -2578,7 +2579,7 @@ get_time_value(proto_tree *tree, tvbuff_t *tvb, const gint start,
}
break;
- case ENC_TIME_CLASSIC_MAC_OS_SECS|ENC_BIG_ENDIAN:
+ case ENC_TIME_MP4_SECS|ENC_BIG_ENDIAN:
/*
* Classic Mac OS time stamps, big-endian.
* Only supported for absolute times.