bx
/
catgirl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Measure length of log timestamp more consistently

weechat-hashes
Curtis McEnroe 2018-11-30 17:17:34 -05:00
parent 70386c93f2
commit 3d9906b00f
No known key found for this signature in database
GPG Key ID: CEA2F97ADCFCD77C
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
log.c
View File

@ -91,7 +91,7 @@ static FILE *logFile(struct Tag tag, const struct tm *time) {
return log->file; 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, ...) { void logFmt(struct Tag tag, const time_t *ts, const char *format, ...) {
if (logRoot < 0) return; 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); FILE *file = logFile(tag, time);
char stamp[StampSize]; char stamp[StampLen + 1];
strftime(stamp, StampSize, "%FT%T%z", time); strftime(stamp, sizeof(stamp), "%FT%T%z", time);
fprintf(file, "[%s] ", stamp); fprintf(file, "[%s] ", stamp);
if (ferror(file)) err(EX_IOERR, "%s", tag.name); if (ferror(file)) err(EX_IOERR, "%s", tag.name);
@ -136,7 +136,7 @@ void logReplay(struct Tag tag) {
char *line; char *line;
while (NULL != (line = fgetln(file, &len))) { while (NULL != (line = fgetln(file, &len))) {
line[len - 1] = '\0'; 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); uiFmt(tag, UICold, "\3%d%s", IRCGray, line);
} }
if (ferror(file)) err(EX_IOERR, "%s", tag.name); if (ferror(file)) err(EX_IOERR, "%s", tag.name);