From 4fb24dda34d6a2f527d8907fc3d04b38176c3903 Mon Sep 17 00:00:00 2001 From: Mark Salyzyn Date: Fri, 12 Jun 2015 22:36:57 +0000 Subject: [PATCH] Revert "logd: regression in log_strtok_r" This reverts commit d3c5093a3ca98246d2036db36db5e9648c3e3345. Change-Id: I52558fd0e9f75ba1cc6a151785fc91857c27ab9a --- logd/LogKlog.cpp | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/logd/LogKlog.cpp b/logd/LogKlog.cpp index 4e0e89611..7d1464899 100644 --- a/logd/LogKlog.cpp +++ b/logd/LogKlog.cpp @@ -68,9 +68,6 @@ static char *is_timestamp(char *s) { continue; } if (!isdigit(c) && (c == ']')) { - if (first_period || (*s != ' ')) { - break; - } return s; } } @@ -78,7 +75,7 @@ static char *is_timestamp(char *s) { } // Like strtok_r with "\r\n" except that we look for log signatures (regex) -// \(\(<[0-9]+>\)\([[] *[0-9]+[.][0-9]+[]] \)\{0,1\}\|[[] *[0-9]+[.][0-9]+[]] \) +// \(\(<[0-9]+>\)\([[] *[0-9]+[]]\)\{0,1\}\|[[] *[0-9]+[]]\) // and split if we see a second one without a newline. #define SIGNATURE_MASK 0xF0