[PATCH 2/2] apply: remove epoch date from regex

From: René Scharfe <l.s.r@web.de>
Date: Aug 25, 2017, 19:06 UTC
Message-ID: <5dd40b51-ac5b-6885-b7b0-f2a33045c386@web.de>
In-Reply-To: <205339f5-bad8-62a3-8ccc-d3b0dd1d6736@web.de>

We check the date of epoch timestamp candidates already with starts_with(). Move beyond that part using skip_prefix() instead of checking it again using a regular expression. Also group the minutes part, so that we can access them using a substring match instead of using a magic number.

Signed-off-by: Rene Scharfe <l.s.r@web.de>
---
 apply.c | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/apply.c b/apply.c
index e14077eaee..9c70b4040a 100644
--- a/apply.c
+++ b/apply.c
@@ -811,9 +811,7 @@ static int has_epoch_timestamp(const char *nameline)
 	 * 1970-01-01, and the seconds part must be "00".
 	 */
 	const char stamp_regexp[] =
-		"^(1969-12-31|1970-01-01)"
-		" "
-		"[0-2][0-9]:[0-5][0-9]:00(\\.0+)?"
+		"^[0-2][0-9]:([0-5][0-9]):00(\\.0+)?"
 		" "
 		"([-+][0-2][0-9]:?[0-5][0-9])\n";
 	const char *timestamp = NULL, *cp, *colon;
@@ -833,9 +831,9 @@ static int has_epoch_timestamp(const char *nameline)
 	 * YYYY-MM-DD hh:mm:ss must be from either 1969-12-31
 	 * (west of GMT) or 1970-01-01 (east of GMT)
 	 */
-	if (starts_with(timestamp, "1969-12-31"))
+	if (skip_prefix(timestamp, "1969-12-31 ", &timestamp))
 		epoch_hour = 24;
-	else if (starts_with(timestamp, "1970-01-01"))
+	else if (skip_prefix(timestamp, "1970-01-01 ", &timestamp))
 		epoch_hour = 0;
 	else
 		return 0;
@@ -857,8 +855,8 @@ static int has_epoch_timestamp(const char *nameline)
 		return 0;
 	}
 
-	hour = strtol(timestamp + 11, NULL, 10);
-	minute = strtol(timestamp + 14, NULL, 10);
+	hour = strtol(timestamp, NULL, 10);
+	minute = strtol(timestamp + m[1].rm_so, NULL, 10);
 
 	zoneoffset = strtol(timestamp + m[3].rm_so + 1, (char **) &colon, 10);
 	if (*colon == ':')

-- 
2.14.1