From 3d9906b00fee2f7a8b69d0e6a1683e306e31b4e6 Mon Sep 17 00:00:00 2001 From: Curtis McEnroe Date: Fri, 30 Nov 2018 17:17:34 -0500 Subject: [PATCH] Measure length of log timestamp more consistently --- log.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/log.c b/log.c index 150b629..0b7e386 100644 --- a/log.c +++ b/log.c @@ -91,7 +91,7 @@ static FILE *logFile(struct Tag tag, const struct tm *time) { return log->file; } -enum { StampSize = sizeof("YYYY-MM-DDThh:mm:ss+hhmm") }; +enum { StampLen = sizeof("YYYY-MM-DDThh:mm:ss+hhmm") - 1 }; void logFmt(struct Tag tag, const time_t *ts, const char *format, ...) { if (logRoot < 0) return; @@ -107,8 +107,8 @@ void logFmt(struct Tag tag, const time_t *ts, const char *format, ...) { FILE *file = logFile(tag, time); - char stamp[StampSize]; - strftime(stamp, StampSize, "%FT%T%z", time); + char stamp[StampLen + 1]; + strftime(stamp, sizeof(stamp), "%FT%T%z", time); fprintf(file, "[%s] ", stamp); if (ferror(file)) err(EX_IOERR, "%s", tag.name); @@ -136,7 +136,7 @@ void logReplay(struct Tag tag) { char *line; while (NULL != (line = fgetln(file, &len))) { line[len - 1] = '\0'; - if (len > 2 + StampSize) line = &line[2 + StampSize]; + if (len > 1 + StampLen + 2) line = &line[1 + StampLen + 2]; uiFmt(tag, UICold, "\3%d%s", IRCGray, line); } if (ferror(file)) err(EX_IOERR, "%s", tag.name);