enlightenment/enlightenment
enlightenment
/
enlightenment
10
9
Fork 12
Code Issues 25 Pull Requests 2 Projects Releases Wiki Activity

mark strftime calls using struct tm in time module as safe 

disable -Wformat-nonliteral temporarily
This commit is contained in:
Mike Blumenkrantz 2017-01-06 12:56:22 -05:00
parent 86505cd885
commit f011db58ce
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/modules/time/time.c
View File

@ -119,7 +119,10 @@ time_datestring_format(Instance *inst, char *buf, int bufsz)
strftime(buf, bufsz, "%F", (const struct tm *)tm);
break;
case CLOCK_DATE_DISPLAY_CUSTOM:
/* 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);
break;
default: break;
@ -141,7 +144,10 @@ time_string_format(Instance *inst, char *buf, int bufsz)
tt = (time_t)(timev.tv_sec);
tm = localtime(&tt);
TZUNSET();
/* 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);
return tm->tm_sec;
}