Merge "Track a Java package rename in comments" (5a258e72) · Commits · e / os / android_system_core

tzdatacheck/tzdatacheck.cpp

+4 −4

Original line number	Diff line number	Diff line
		@@ -31,7 +31,7 @@
		#include "android-base/logging.h"

		// The name of the file containing the distro version information.
		// See also libcore.tzdata.update2.TimeZoneDistro / libcore.tzdata.update2.DistroVersion.
		// See also libcore.tzdata.shared2.TimeZoneDistro / libcore.tzdata.shared2.DistroVersion.
		static const char* DISTRO_VERSION_FILENAME = "/distro_version";

		// distro_version is an ASCII file consisting of 17 bytes in the form: AAA.BBB\|CCCCC\|DDD
		@@ -42,14 +42,14 @@ static const char* DISTRO_VERSION_FILENAME = "/distro_version";
		static const int DISTRO_VERSION_LENGTH = 13;

		// The major version of the distro format supported by this code as a null-terminated char[].
		// See also libcore.tzdata.update2.TimeZoneDistro / libcore.tzdata.update2.DistroVersion.
		// See also libcore.tzdata.shared2.TimeZoneDistro / libcore.tzdata.shared2.DistroVersion.
		static const char SUPPORTED_DISTRO_MAJOR_VERSION[] = "001";

		// The length of the distro format major version excluding the \0
		static const size_t SUPPORTED_DISTRO_MAJOR_VERSION_LEN = sizeof(SUPPORTED_DISTRO_MAJOR_VERSION) - 1;

		// The minor version of the distro format supported by this code as a null-terminated char[].
		// See also libcore.tzdata.update2.TimeZoneDistro / libcore.tzdata.update2.DistroVersion.
		// See also libcore.tzdata.shared2.TimeZoneDistro / libcore.tzdata.shared2.DistroVersion.
		static const char SUPPORTED_DISTRO_MINOR_VERSION[] = "001";

		// The length of the distro format minor version excluding the \0
		@@ -65,7 +65,7 @@ static const size_t RULES_VERSION_LEN = 5;
		// Distro version bytes are: AAA.BBB\|CCCCC - the rules version is CCCCC
		static const size_t DISTRO_VERSION_RULES_IDX = 8;

		// See also libcore.tzdata.update2.TimeZoneDistro.
		// See also libcore.tzdata.shared2.TimeZoneDistro.
		static const char* TZDATA_FILENAME = "/tzdata";

		// tzdata file header (as much as we need for the version):