Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(8045)

Unified Diff: chrome/browser/extensions/api/log_private/syslog_parser.cc

Issue 266193002: Extend PR_ParseTimeString() to accept some ISO 8601 formats to fix timezone parsing in SyslogParser. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: New approach: Extend PR_ParseTimeString() to handle some ISO 8601 formats. Created 6 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/extensions/api/log_private/syslog_parser.cc
diff --git a/chrome/browser/extensions/api/log_private/syslog_parser.cc b/chrome/browser/extensions/api/log_private/syslog_parser.cc
index 5479886c4ca2324ee6c9f8cdd968091986e53f42..4f26653554dc0458430c3f899f30155167adb8c3 100644
--- a/chrome/browser/extensions/api/log_private/syslog_parser.cc
+++ b/chrome/browser/extensions/api/log_private/syslog_parser.cc
@@ -23,8 +23,6 @@ namespace extensions {
namespace {
-const int kExpectedTimeTokenNum = 7;
-const char kLogEntryDelimiters[] = "-:T";
const char kProcessInfoDelimiters[] = "[]";
} // namespace
@@ -71,39 +69,15 @@ SyslogParser::Error SyslogParser::ParseEntry(
return SyslogParser::SUCCESS;
}
-SyslogParser::Error ParseTimeHelper(base::StringTokenizer* tokenizer,
- std::string* output) {
- if (!tokenizer->GetNext()) {
- LOG(ERROR) << "Error when parsing time";
- return SyslogParser::PARSE_ERROR;
- }
- *output = tokenizer->token();
- return SyslogParser::SUCCESS;
-}
-
SyslogParser::Error SyslogParser::ParseTime(const std::string& input,
double* output) const {
- base::StringTokenizer tokenizer(input, kLogEntryDelimiters);
- std::string tokens[kExpectedTimeTokenNum];
- for (int i = 0; i < kExpectedTimeTokenNum; i++) {
- if (ParseTimeHelper(&tokenizer, &(tokens[i])) != SyslogParser::SUCCESS)
- return SyslogParser::PARSE_ERROR;
- }
-
- std::string buffer = tokens[1] + '-' + tokens[2] + '-' + tokens[0] + ' ' +
- tokens[3] + ':' + tokens[4] + ":00";
-
base::Time parsed_time;
- if (!base::Time::FromString(buffer.c_str(), &parsed_time)) {
+ if (!base::Time::FromString(input.c_str(), &parsed_time)) {
LOG(ERROR) << "Error when parsing time";
return SyslogParser::PARSE_ERROR;
}
- double seconds;
- base::StringToDouble(tokens[5], &seconds);
- *output = parsed_time.ToJsTime() +
- (seconds * base::Time::kMillisecondsPerSecond);
-
+ *output = parsed_time.ToJsTime();
return SyslogParser::SUCCESS;
}

Powered by Google App Engine
This is Rietveld 408576698