Skip to content

Fightwarn - macos llvm - nonliteral format strings #885

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jimklimov merged 33 commits into from
Nov 25, 2020
Merged

Fightwarn - macos llvm - nonliteral format strings #885

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
924bc0b
common/common.c: snprintfcat(): do not warn about nonliteral format s…
jimklimov Nov 17, 2020
19f3a36
common/common.c: various routines: do not warn about nonliteral forma…
jimklimov Nov 20, 2020
7acde9b
common/common.c: fix diags pragmas to use our configured-support macr…
jimklimov Nov 22, 2020
df6f49f
clients/upssched.c: send_to_one(): do not warn about nonliteral forma…
jimklimov Nov 17, 2020
81114c3
clients/upssched.c: fix diags pragmas to use our configured-support m…
jimklimov Nov 22, 2020
514074e
drivers/dstate.c: various routines: do not warn about nonliteral form…
jimklimov Nov 18, 2020
29e09e4
drivers/dstate.c: fix diags pragmas to use our configured-support mac…
jimklimov Nov 22, 2020
b64b97a
drivers/serial.c: do not warn about nonliteral format string in this …
jimklimov Nov 18, 2020
237e21c
drivers/serial.c: fix diags pragmas to use our configured-support mac…
jimklimov Nov 22, 2020
68c6d23
drivers/bestfortress.c: do not warn about nonliteral format string in…
jimklimov Nov 18, 2020
2a7bdfa
drivers/bestfortress.c: setinfo_float(): comment about a casting prob…
jimklimov Nov 18, 2020
5955e09
drivers/bestfortress.c: fix diags pragmas to use our configured-suppo…
jimklimov Nov 22, 2020
4e713a9
drivers/mge-utalk.c: various routines: do not warn about nonliteral f…
jimklimov Nov 18, 2020
6ace1cd
drivers/mge-utalk.c: fix diags pragmas to use our configured-support …
jimklimov Nov 22, 2020
23b50e4
drivers/powerp-txt.c: do not warn about nonliteral format string in t…
jimklimov Nov 18, 2020
11cf32f
drivers/powerp-txt.c: fix diags pragmas to use our configured-support…
jimklimov Nov 22, 2020
f2eee14
drivers/blazer.c: various routines: do not warn about nonliteral form…
jimklimov Nov 18, 2020
b5b98e2
drivers/blazer.c: fix diags pragmas to use our configured-support mac…
jimklimov Nov 22, 2020
5115977
drivers/apcupsd-ups.c: do not warn about nonliteral format string in …
jimklimov Nov 18, 2020
ea82df0
drivers/apcupsd-ups.c: fix diags pragmas to use our configured-suppor…
jimklimov Nov 22, 2020
f799548
drivers/nutdrv_qx_bestups.c: various routines: do not warn about nonl…
jimklimov Nov 18, 2020
70f6377
drivers/nutdrv_qx_bestups.c: fix diags pragmas to use our configured-…
jimklimov Nov 22, 2020
26653c6
drivers/nutdrv_qx_blazer-common.c: various routines: do not warn abou…
jimklimov Nov 18, 2020
ff335d7
drivers/nutdrv_qx_blazer-common.c: fix diags pragmas to use our confi…
jimklimov Nov 22, 2020
6c50d05
drivers/nutdrv_qx_mecer.c: various routines: do not warn about nonlit…
jimklimov Nov 18, 2020
32fe8be
drivers/nutdrv_qx_mecer.c: fix diags pragmas to use our configured-su…
jimklimov Nov 22, 2020
e62721b
drivers/nutdrv_qx_voltronic-qs.c: do not warn about nonliteral format…
jimklimov Nov 18, 2020
93d7fe8
drivers/nutdrv_qx_voltronic-qs.c: fix diags pragmas to use our config…
jimklimov Nov 22, 2020
2f414a1
drivers/nutdrv_qx_voltronic-qs-hex.c: various routines: do not warn a…
jimklimov Nov 18, 2020
67fff31
drivers/nutdrv_qx_voltronic-qs-hex.c: fix diags pragmas to use our co…
jimklimov Nov 22, 2020
331ed79
tools/nut-scanner/nutscan-serial.c: do not warn about nonliteral form…
jimklimov Nov 18, 2020
8eea9fd
tools/nut-scanner/nutscan-serial.c: fix diags pragmas to use our conf…
jimklimov Nov 22, 2020
659b288
drivers/tripplite.c: upsdrv_initinfo(): use a literal format string
jimklimov Nov 18, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions clients/upssched.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -339,7 +339,19 @@ static int send_to_one(conn_t *conn, const char *fmt, ...)
char buf[US_SOCK_BUF_LEN];

va_start(ap, fmt);
#ifdef HAVE_PRAGMAS_FOR_GCC_DIAGNOSTIC_IGNORED_FORMAT_NONLITERAL
#pragma GCC diagnostic push
#endif
#ifdef HAVE_PRAGMA_GCC_DIAGNOSTIC_IGNORED_FORMAT_NONLITERAL
#pragma GCC diagnostic ignored "-Wformat-nonliteral"
#endif
#ifdef HAVE_PRAGMA_GCC_DIAGNOSTIC_IGNORED_FORMAT_SECURITY
#pragma GCC diagnostic ignored "-Wformat-security"
#endif
vsnprintf(buf, sizeof(buf), fmt, ap);
#ifdef HAVE_PRAGMAS_FOR_GCC_DIAGNOSTIC_IGNORED_FORMAT_NONLITERAL
#pragma GCC diagnostic pop
#endif
va_end(ap);

ret = write(conn->fd, buf, strlen(buf));
Expand Down
109 changes: 109 additions & 0 deletions common/common.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -300,7 +300,20 @@ int snprintfcat(char *dst, size_t size, const char *fmt, ...)
assert(len <= size);

va_start(ap, fmt);
#ifdef HAVE_PRAGMAS_FOR_GCC_DIAGNOSTIC_IGNORED_FORMAT_NONLITERAL
#pragma GCC diagnostic push
#endif
#ifdef HAVE_PRAGMA_GCC_DIAGNOSTIC_IGNORED_FORMAT_NONLITERAL
#pragma GCC diagnostic ignored "-Wformat-nonliteral"
#endif
#ifdef HAVE_PRAGMA_GCC_DIAGNOSTIC_IGNORED_FORMAT_SECURITY
#pragma GCC diagnostic ignored "-Wformat-security"
#endif
/* Note: this code intentionally uses a caller-provided format string */
ret = vsnprintf(dst + len, size - len, fmt, ap);
#ifdef HAVE_PRAGMAS_FOR_GCC_DIAGNOSTIC_IGNORED_FORMAT_NONLITERAL
#pragma GCC diagnostic pop
#endif
va_end(ap);

dst[size] = '\0';
Expand Down Expand Up @@ -341,7 +354,19 @@ static void vupslog(int priority, const char *fmt, va_list va, int use_strerror)
int ret;
char buf[LARGEBUF];

#ifdef HAVE_PRAGMAS_FOR_GCC_DIAGNOSTIC_IGNORED_FORMAT_NONLITERAL
#pragma GCC diagnostic push
#endif
#ifdef HAVE_PRAGMA_GCC_DIAGNOSTIC_IGNORED_FORMAT_NONLITERAL
#pragma GCC diagnostic ignored "-Wformat-nonliteral"
#endif
#ifdef HAVE_PRAGMA_GCC_DIAGNOSTIC_IGNORED_FORMAT_SECURITY
#pragma GCC diagnostic ignored "-Wformat-security"
#endif
ret = vsnprintf(buf, sizeof(buf), fmt, va);
#ifdef HAVE_PRAGMAS_FOR_GCC_DIAGNOSTIC_IGNORED_FORMAT_NONLITERAL
#pragma GCC diagnostic pop
#endif

if ((ret < 0) || (ret >= (int) sizeof(buf)))
syslog(LOG_WARNING, "vupslog: vsnprintf needed more than %d bytes",
Expand Down Expand Up @@ -428,7 +453,19 @@ void upslog_with_errno(int priority, const char *fmt, ...)
va_list va;

va_start(va, fmt);
#ifdef HAVE_PRAGMAS_FOR_GCC_DIAGNOSTIC_IGNORED_FORMAT_NONLITERAL
#pragma GCC diagnostic push
#endif
#ifdef HAVE_PRAGMA_GCC_DIAGNOSTIC_IGNORED_FORMAT_NONLITERAL
#pragma GCC diagnostic ignored "-Wformat-nonliteral"
#endif
#ifdef HAVE_PRAGMA_GCC_DIAGNOSTIC_IGNORED_FORMAT_SECURITY
#pragma GCC diagnostic ignored "-Wformat-security"
#endif
vupslog(priority, fmt, va, 1);
#ifdef HAVE_PRAGMAS_FOR_GCC_DIAGNOSTIC_IGNORED_FORMAT_NONLITERAL
#pragma GCC diagnostic pop
#endif
va_end(va);
}

Expand All @@ -438,7 +475,19 @@ void upslogx(int priority, const char *fmt, ...)
va_list va;

va_start(va, fmt);
#ifdef HAVE_PRAGMAS_FOR_GCC_DIAGNOSTIC_IGNORED_FORMAT_NONLITERAL
#pragma GCC diagnostic push
#endif
#ifdef HAVE_PRAGMA_GCC_DIAGNOSTIC_IGNORED_FORMAT_NONLITERAL
#pragma GCC diagnostic ignored "-Wformat-nonliteral"
#endif
#ifdef HAVE_PRAGMA_GCC_DIAGNOSTIC_IGNORED_FORMAT_SECURITY
#pragma GCC diagnostic ignored "-Wformat-security"
#endif
vupslog(priority, fmt, va, 0);
#ifdef HAVE_PRAGMAS_FOR_GCC_DIAGNOSTIC_IGNORED_FORMAT_NONLITERAL
#pragma GCC diagnostic pop
#endif
va_end(va);
}

Expand Down Expand Up @@ -467,7 +516,19 @@ void upsdebug_with_errno(int level, const char *fmt, ...)
}

va_start(va, fmt);
#ifdef HAVE_PRAGMAS_FOR_GCC_DIAGNOSTIC_IGNORED_FORMAT_NONLITERAL
#pragma GCC diagnostic push
#endif
#ifdef HAVE_PRAGMA_GCC_DIAGNOSTIC_IGNORED_FORMAT_NONLITERAL
#pragma GCC diagnostic ignored "-Wformat-nonliteral"
#endif
#ifdef HAVE_PRAGMA_GCC_DIAGNOSTIC_IGNORED_FORMAT_SECURITY
#pragma GCC diagnostic ignored "-Wformat-security"
#endif
vupslog(LOG_DEBUG, fmt, va, 1);
#ifdef HAVE_PRAGMAS_FOR_GCC_DIAGNOSTIC_IGNORED_FORMAT_NONLITERAL
#pragma GCC diagnostic pop
#endif
va_end(va);
}

Expand All @@ -492,7 +553,19 @@ void upsdebugx(int level, const char *fmt, ...)
}

va_start(va, fmt);
#ifdef HAVE_PRAGMAS_FOR_GCC_DIAGNOSTIC_IGNORED_FORMAT_NONLITERAL
#pragma GCC diagnostic push
#endif
#ifdef HAVE_PRAGMA_GCC_DIAGNOSTIC_IGNORED_FORMAT_NONLITERAL
#pragma GCC diagnostic ignored "-Wformat-nonliteral"
#endif
#ifdef HAVE_PRAGMA_GCC_DIAGNOSTIC_IGNORED_FORMAT_SECURITY
#pragma GCC diagnostic ignored "-Wformat-security"
#endif
vupslog(LOG_DEBUG, fmt, va, 0);
#ifdef HAVE_PRAGMAS_FOR_GCC_DIAGNOSTIC_IGNORED_FORMAT_NONLITERAL
#pragma GCC diagnostic pop
#endif
va_end(va);
}

Expand Down Expand Up @@ -589,15 +662,39 @@ static void vfatal(const char *fmt, va_list va, int use_strerror)
if (xbit_test(upslog_flags, UPSLOG_SYSLOG_ON_FATAL))
xbit_set(&upslog_flags, UPSLOG_SYSLOG);

#ifdef HAVE_PRAGMAS_FOR_GCC_DIAGNOSTIC_IGNORED_FORMAT_NONLITERAL
#pragma GCC diagnostic push
#endif
#ifdef HAVE_PRAGMA_GCC_DIAGNOSTIC_IGNORED_FORMAT_NONLITERAL
#pragma GCC diagnostic ignored "-Wformat-nonliteral"
#endif
#ifdef HAVE_PRAGMA_GCC_DIAGNOSTIC_IGNORED_FORMAT_SECURITY
#pragma GCC diagnostic ignored "-Wformat-security"
#endif
vupslog(LOG_ERR, fmt, va, use_strerror);
#ifdef HAVE_PRAGMAS_FOR_GCC_DIAGNOSTIC_IGNORED_FORMAT_NONLITERAL
#pragma GCC diagnostic pop
#endif
}

void fatal_with_errno(int status, const char *fmt, ...)
{
va_list va;

va_start(va, fmt);
#ifdef HAVE_PRAGMAS_FOR_GCC_DIAGNOSTIC_IGNORED_FORMAT_NONLITERAL
#pragma GCC diagnostic push
#endif
#ifdef HAVE_PRAGMA_GCC_DIAGNOSTIC_IGNORED_FORMAT_NONLITERAL
#pragma GCC diagnostic ignored "-Wformat-nonliteral"
#endif
#ifdef HAVE_PRAGMA_GCC_DIAGNOSTIC_IGNORED_FORMAT_SECURITY
#pragma GCC diagnostic ignored "-Wformat-security"
#endif
vfatal(fmt, va, (errno > 0) ? 1 : 0);
#ifdef HAVE_PRAGMAS_FOR_GCC_DIAGNOSTIC_IGNORED_FORMAT_NONLITERAL
#pragma GCC diagnostic pop
#endif
va_end(va);

exit(status);
Expand All @@ -608,7 +705,19 @@ void fatalx(int status, const char *fmt, ...)
va_list va;

va_start(va, fmt);
#ifdef HAVE_PRAGMAS_FOR_GCC_DIAGNOSTIC_IGNORED_FORMAT_NONLITERAL
#pragma GCC diagnostic push
#endif
#ifdef HAVE_PRAGMA_GCC_DIAGNOSTIC_IGNORED_FORMAT_NONLITERAL
#pragma GCC diagnostic ignored "-Wformat-nonliteral"
#endif
#ifdef HAVE_PRAGMA_GCC_DIAGNOSTIC_IGNORED_FORMAT_SECURITY
#pragma GCC diagnostic ignored "-Wformat-security"
#endif
vfatal(fmt, va, 0);
#ifdef HAVE_PRAGMAS_FOR_GCC_DIAGNOSTIC_IGNORED_FORMAT_NONLITERAL
#pragma GCC diagnostic pop
#endif
va_end(va);

exit(status);
Expand Down
22 changes: 19 additions & 3 deletions drivers/apcupsd-ups.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,9 +133,25 @@ static void process(char *item,char *data)
data[(int)nut_data[i].info_len]=0;
dstate_setinfo(nut_data[i].info_type,"%s",data);
}
else dstate_setinfo(nut_data[i].info_type,
nut_data[i].default_value,
atof(data)*nut_data[i].info_len);
else
{
#ifdef HAVE_PRAGMAS_FOR_GCC_DIAGNOSTIC_IGNORED_FORMAT_NONLITERAL
#pragma GCC diagnostic push
#endif
#ifdef HAVE_PRAGMA_GCC_DIAGNOSTIC_IGNORED_FORMAT_NONLITERAL
#pragma GCC diagnostic ignored "-Wformat-nonliteral"
#endif
#ifdef HAVE_PRAGMA_GCC_DIAGNOSTIC_IGNORED_FORMAT_SECURITY
#pragma GCC diagnostic ignored "-Wformat-security"
#endif
/* default_value acts as a format string in this case */
dstate_setinfo(nut_data[i].info_type,
nut_data[i].default_value,
atof(data)*nut_data[i].info_len);
#ifdef HAVE_PRAGMAS_FOR_GCC_DIAGNOSTIC_IGNORED_FORMAT_NONLITERAL
#pragma GCC diagnostic pop
#endif
}
break;
}
}
Expand Down
28 changes: 28 additions & 0 deletions drivers/bestfortress.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,23 @@ static inline void setinfo_float (const char *key, const char * fmt, const char
len = sizeof(buf)-1;
strncpy (buf, s, len);
buf[len] = 0;

#ifdef HAVE_PRAGMAS_FOR_GCC_DIAGNOSTIC_IGNORED_FORMAT_NONLITERAL
#pragma GCC diagnostic push
#endif
#ifdef HAVE_PRAGMA_GCC_DIAGNOSTIC_IGNORED_FORMAT_NONLITERAL
#pragma GCC diagnostic ignored "-Wformat-nonliteral"
#endif
#ifdef HAVE_PRAGMA_GCC_DIAGNOSTIC_IGNORED_FORMAT_SECURITY
#pragma GCC diagnostic ignored "-Wformat-security"
#endif
/* FIXME (bitness-dependent?):
* error: cast from function call of type 'int' to non-matching type 'double' [-Werror,-Wbad-function-cast]
*/
dstate_setinfo (key, fmt, factor * (double)atoi (buf));
#ifdef HAVE_PRAGMAS_FOR_GCC_DIAGNOSTIC_IGNORED_FORMAT_NONLITERAL
#pragma GCC diagnostic pop
#endif
}

static int upssend(const char *fmt,...) {
Expand All @@ -168,7 +184,19 @@ static int upssend(const char *fmt,...) {
int d_usec = UPSDELAY;

va_start(ap, fmt);
#ifdef HAVE_PRAGMAS_FOR_GCC_DIAGNOSTIC_IGNORED_FORMAT_NONLITERAL
#pragma GCC diagnostic push
#endif
#ifdef HAVE_PRAGMA_GCC_DIAGNOSTIC_IGNORED_FORMAT_NONLITERAL
#pragma GCC diagnostic ignored "-Wformat-nonliteral"
#endif
#ifdef HAVE_PRAGMA_GCC_DIAGNOSTIC_IGNORED_FORMAT_SECURITY
#pragma GCC diagnostic ignored "-Wformat-security"
#endif
ret = vsnprintf(buf, sizeof(buf), fmt, ap);
#ifdef HAVE_PRAGMAS_FOR_GCC_DIAGNOSTIC_IGNORED_FORMAT_NONLITERAL
#pragma GCC diagnostic pop
#endif
va_end(ap);

if ((ret < 1) || (ret >= (int) sizeof(buf)))
Expand Down
26 changes: 26 additions & 0 deletions drivers/blazer.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,20 @@ static int blazer_status(const char *cmd)
continue;
}

#ifdef HAVE_PRAGMAS_FOR_GCC_DIAGNOSTIC_IGNORED_FORMAT_NONLITERAL
#pragma GCC diagnostic push
#endif
#ifdef HAVE_PRAGMA_GCC_DIAGNOSTIC_IGNORED_FORMAT_NONLITERAL
#pragma GCC diagnostic ignored "-Wformat-nonliteral"
#endif
#ifdef HAVE_PRAGMA_GCC_DIAGNOSTIC_IGNORED_FORMAT_SECURITY
#pragma GCC diagnostic ignored "-Wformat-security"
#endif
dstate_setinfo(status[i].var, status[i].fmt, status[i].conv(val, NULL));
#ifdef HAVE_PRAGMAS_FOR_GCC_DIAGNOSTIC_IGNORED_FORMAT_NONLITERAL
#pragma GCC diagnostic pop
#endif

}

if (!val) {
Expand Down Expand Up @@ -338,7 +351,20 @@ static int blazer_rating(const char *cmd)
continue;
}

#ifdef HAVE_PRAGMAS_FOR_GCC_DIAGNOSTIC_IGNORED_FORMAT_NONLITERAL
#pragma GCC diagnostic push
#endif
#ifdef HAVE_PRAGMA_GCC_DIAGNOSTIC_IGNORED_FORMAT_NONLITERAL
#pragma GCC diagnostic ignored "-Wformat-nonliteral"
#endif
#ifdef HAVE_PRAGMA_GCC_DIAGNOSTIC_IGNORED_FORMAT_SECURITY
#pragma GCC diagnostic ignored "-Wformat-security"
#endif
dstate_setinfo(rating[i].var, rating[i].fmt, rating[i].conv(val, NULL));
#ifdef HAVE_PRAGMAS_FOR_GCC_DIAGNOSTIC_IGNORED_FORMAT_NONLITERAL
#pragma GCC diagnostic pop
#endif

}

return 0;
Expand Down
48 changes: 48 additions & 0 deletions drivers/dstate.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,19 @@ static void send_to_all(const char *fmt, ...)
conn_t *conn, *cnext;

va_start(ap, fmt);
#ifdef HAVE_PRAGMAS_FOR_GCC_DIAGNOSTIC_IGNORED_FORMAT_NONLITERAL
#pragma GCC diagnostic push
#endif
#ifdef HAVE_PRAGMA_GCC_DIAGNOSTIC_IGNORED_FORMAT_NONLITERAL
#pragma GCC diagnostic ignored "-Wformat-nonliteral"
#endif
#ifdef HAVE_PRAGMA_GCC_DIAGNOSTIC_IGNORED_FORMAT_SECURITY
#pragma GCC diagnostic ignored "-Wformat-security"
#endif
ret = vsnprintf(buf, sizeof(buf), fmt, ap);
#ifdef HAVE_PRAGMAS_FOR_GCC_DIAGNOSTIC_IGNORED_FORMAT_NONLITERAL
#pragma GCC diagnostic pop
#endif
va_end(ap);

if (ret < 1) {
Expand Down Expand Up @@ -202,7 +214,19 @@ static int send_to_one(conn_t *conn, const char *fmt, ...)
char buf[ST_SOCK_BUF_LEN];

va_start(ap, fmt);
#ifdef HAVE_PRAGMAS_FOR_GCC_DIAGNOSTIC_IGNORED_FORMAT_NONLITERAL
#pragma GCC diagnostic push
#endif
#ifdef HAVE_PRAGMA_GCC_DIAGNOSTIC_IGNORED_FORMAT_NONLITERAL
#pragma GCC diagnostic ignored "-Wformat-nonliteral"
#endif
#ifdef HAVE_PRAGMA_GCC_DIAGNOSTIC_IGNORED_FORMAT_SECURITY
#pragma GCC diagnostic ignored "-Wformat-security"
#endif
ret = vsnprintf(buf, sizeof(buf), fmt, ap);
#ifdef HAVE_PRAGMAS_FOR_GCC_DIAGNOSTIC_IGNORED_FORMAT_NONLITERAL
#pragma GCC diagnostic pop
#endif
va_end(ap);

upsdebugx(2, "%s: sending %.*s", __func__, (int)strcspn(buf, "\n"), buf);
Expand Down Expand Up @@ -669,7 +693,19 @@ int dstate_setinfo(const char *var, const char *fmt, ...)
va_list ap;

va_start(ap, fmt);
#ifdef HAVE_PRAGMAS_FOR_GCC_DIAGNOSTIC_IGNORED_FORMAT_NONLITERAL
#pragma GCC diagnostic push
#endif
#ifdef HAVE_PRAGMA_GCC_DIAGNOSTIC_IGNORED_FORMAT_NONLITERAL
#pragma GCC diagnostic ignored "-Wformat-nonliteral"
#endif
#ifdef HAVE_PRAGMA_GCC_DIAGNOSTIC_IGNORED_FORMAT_SECURITY
#pragma GCC diagnostic ignored "-Wformat-security"
#endif
vsnprintf(value, sizeof(value), fmt, ap);
#ifdef HAVE_PRAGMAS_FOR_GCC_DIAGNOSTIC_IGNORED_FORMAT_NONLITERAL
#pragma GCC diagnostic pop
#endif
va_end(ap);

ret = state_setinfo(&dtree_root, var, value);
Expand All @@ -688,7 +724,19 @@ int dstate_addenum(const char *var, const char *fmt, ...)
va_list ap;

va_start(ap, fmt);
#ifdef HAVE_PRAGMAS_FOR_GCC_DIAGNOSTIC_IGNORED_FORMAT_NONLITERAL
#pragma GCC diagnostic push
#endif
#ifdef HAVE_PRAGMA_GCC_DIAGNOSTIC_IGNORED_FORMAT_NONLITERAL
#pragma GCC diagnostic ignored "-Wformat-nonliteral"
#endif
#ifdef HAVE_PRAGMA_GCC_DIAGNOSTIC_IGNORED_FORMAT_SECURITY
#pragma GCC diagnostic ignored "-Wformat-security"
#endif
vsnprintf(value, sizeof(value), fmt, ap);
#ifdef HAVE_PRAGMAS_FOR_GCC_DIAGNOSTIC_IGNORED_FORMAT_NONLITERAL
#pragma GCC diagnostic pop
#endif
va_end(ap);

ret = state_addenum(dtree_root, var, value);
Expand Down
Loading