From c3dd3cf82892c6e61246e5a7b3cc7bf9484af6a2 Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Fri, 10 Feb 2017 17:23:43 -0500 Subject: [PATCH] wrap time module strftime calls more loosely when disabling -Wflags --- src/modules/time/time.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/modules/time/time.c b/src/modules/time/time.c index f34179b11..ef734ca7e 100644 --- a/src/modules/time/time.c +++ b/src/modules/time/time.c @@ -122,8 +122,8 @@ time_datestring_format(Instance *inst, char *buf, int bufsz) /* disable warning for known-safe code */ DISABLE_WARNING(format-nonliteral, format-nonliteral, format-nonliteral) if (!strftime(buf, bufsz, inst->cfg->time_str[1] ?: default_str, (const struct tm *)tm)) -ENABLE_WARNING(format-nonliteral, format-nonliteral, format-nonliteral) strncpy(buf, "ERROR", bufsz - 1); +ENABLE_WARNING(format-nonliteral, format-nonliteral, format-nonliteral) break; default: break; } @@ -147,8 +147,8 @@ time_string_format(Instance *inst, char *buf, int bufsz) /* disable warning for known-safe code */ DISABLE_WARNING(format-nonliteral, format-nonliteral, format-nonliteral) if (!strftime(buf, bufsz, inst->cfg->time_str[0] ?: default_fmt, (const struct tm *)tm)) -ENABLE_WARNING(format-nonliteral, format-nonliteral, format-nonliteral) strncpy(buf, "ERROR", bufsz - 1); +ENABLE_WARNING(format-nonliteral, format-nonliteral, format-nonliteral) return tm->tm_sec; }