From 5ad27d67d32ed56ba9b706dc265766908e8b35e1 Mon Sep 17 00:00:00 2001 From: seleznevae Date: Tue, 27 Aug 2019 09:08:38 +0300 Subject: [PATCH] [F] Fix compilation warning --- lib/fort.c | 15 +++++++++++++++ src/row.c | 15 +++++++++++++++ 2 files changed, 30 insertions(+) diff --git a/lib/fort.c b/lib/fort.c index 1c49e6f..757bfd9 100644 --- a/lib/fort.c +++ b/lib/fort.c @@ -5588,6 +5588,15 @@ static int vsnprintf_buffer(string_buffer_t *buffer, const struct ft_string *fmt, va_list *va) { + /* Disable compiler diagnostic (format string is not a string literal) */ +#if defined(FT_CLANG_COMPILER) +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wformat-nonliteral" +#endif +#if defined(FT_GCC_COMPILER) +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wformat-nonliteral" +#endif switch (buffer->type) { case CHAR_BUF: return vsnprintf(buffer->str.cstr, string_buffer_width_capacity(buffer), fmt->u.cstr, *va); @@ -5603,6 +5612,12 @@ vsnprintf_buffer(string_buffer_t *buffer, const struct ft_string *fmt, assert(0); return 0; } +#if defined(FT_CLANG_COMPILER) +#pragma clang diagnostic pop +#endif +#if defined(FT_GCC_COMPILER) +#pragma GCC diagnostic pop +#endif } FT_INTERNAL diff --git a/src/row.c b/src/row.c index 2fb8e72..c03321c 100644 --- a/src/row.c +++ b/src/row.c @@ -608,6 +608,15 @@ static int vsnprintf_buffer(string_buffer_t *buffer, const struct ft_string *fmt, va_list *va) { + /* Disable compiler diagnostic (format string is not a string literal) */ +#if defined(FT_CLANG_COMPILER) +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wformat-nonliteral" +#endif +#if defined(FT_GCC_COMPILER) +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wformat-nonliteral" +#endif switch (buffer->type) { case CHAR_BUF: return vsnprintf(buffer->str.cstr, string_buffer_width_capacity(buffer), fmt->u.cstr, *va); @@ -623,6 +632,12 @@ vsnprintf_buffer(string_buffer_t *buffer, const struct ft_string *fmt, assert(0); return 0; } +#if defined(FT_CLANG_COMPILER) +#pragma clang diagnostic pop +#endif +#if defined(FT_GCC_COMPILER) +#pragma GCC diagnostic pop +#endif } FT_INTERNAL