diff options
| author | Simon McVittie <smcv@collabora.com> | 2021-05-20 17:57:13 +0100 |
|---|---|---|
| committer | Alexander Larsson <alexander.larsson@gmail.com> | 2021-05-25 10:33:18 +0200 |
| commit | 17b6c31c7c51ec45ed556c309a00a30c90bf83c8 (patch) | |
| tree | 620bbe29085d35137cfe49b19a891faffe6a61f7 | |
| parent | 0592caca8a778d448a143b4b9178b3067dde4963 (diff) | |
| download | flatpak-17b6c31c7c51ec45ed556c309a00a30c90bf83c8.tar.gz | |
Add missing G_GNUC_PRINTF attributes
This allows callers to be checked for mismatches between format string
and arguments, and also means gcc can assume that the format string and
the arguments match up correctly when forwarding them to functions
like g_strdup_vprintf, removing the need to suppress -Wformat-nonliteral
warnings.
Signed-off-by: Simon McVittie <smcv@collabora.com>
| -rw-r--r-- | app/flatpak-complete.c | 3 | ||||
| -rw-r--r-- | app/flatpak-complete.h | 2 | ||||
| -rw-r--r-- | app/flatpak-table-printer.c | 3 | ||||
| -rw-r--r-- | app/flatpak-table-printer.h | 2 | ||||
| -rw-r--r-- | common/flatpak-dir.c | 6 |
5 files changed, 3 insertions, 13 deletions
diff --git a/app/flatpak-complete.c b/app/flatpak-complete.c index 625b5296..ba1016b7 100644 --- a/app/flatpak-complete.c +++ b/app/flatpak-complete.c @@ -36,10 +36,7 @@ flatpak_completion_debug (const gchar *format, ...) static FILE *f = NULL; va_start (var_args, format); -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wformat-nonliteral" s = g_strdup_vprintf (format, var_args); -#pragma GCC diagnostic pop if (f == NULL) f = fopen ("/tmp/flatpak-completion-debug.txt", "a+"); fprintf (f, "%s\n", s); diff --git a/app/flatpak-complete.h b/app/flatpak-complete.h index b528b24a..dad9e338 100644 --- a/app/flatpak-complete.h +++ b/app/flatpak-complete.h @@ -41,7 +41,7 @@ struct FlatpakCompletion }; void flatpak_completion_debug (const gchar *format, - ...); + ...) G_GNUC_PRINTF (1, 2); FlatpakCompletion *flatpak_completion_new (const char *arg_line, const char *arg_point, diff --git a/app/flatpak-table-printer.c b/app/flatpak-table-printer.c index a1e9d727..c6a2a323 100644 --- a/app/flatpak-table-printer.c +++ b/app/flatpak-table-printer.c @@ -274,12 +274,9 @@ flatpak_table_printer_append_with_comma_printf (FlatpakTablePrinter *printer, va_list var_args; g_autofree char *s = NULL; -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wformat-nonliteral" va_start (var_args, format); s = g_strdup_vprintf (format, var_args); va_end (var_args); -#pragma GCC diagnostic pop flatpak_table_printer_append_with_comma (printer, s); } diff --git a/app/flatpak-table-printer.h b/app/flatpak-table-printer.h index dad03345..c54fdcb3 100644 --- a/app/flatpak-table-printer.h +++ b/app/flatpak-table-printer.h @@ -53,7 +53,7 @@ void flatpak_table_printer_append_with_comma (FlatpakTablePrinter const char *text); void flatpak_table_printer_append_with_comma_printf (FlatpakTablePrinter *printer, const char *format, - ...); + ...) G_GNUC_PRINTF (2, 3); void flatpak_table_printer_set_key (FlatpakTablePrinter *printer, const char *key); void flatpak_table_printer_finish_row (FlatpakTablePrinter *printer); diff --git a/common/flatpak-dir.c b/common/flatpak-dir.c index 4294cd48..dcb5ab9d 100644 --- a/common/flatpak-dir.c +++ b/common/flatpak-dir.c @@ -179,7 +179,7 @@ static void flatpak_dir_log (FlatpakDir *self, const char *old_commit, const char *url, const char *format, - ...); + ...) G_GNUC_PRINTF (12, 13); #define flatpak_dir_log(self, change, remote, ref, commit, old_commit, url, format, ...) \ (flatpak_dir_log) (self, __FILE__, __LINE__, __FUNCTION__, \ @@ -15689,11 +15689,7 @@ static void len = g_snprintf (message, sizeof (message), "%s: ", installation); va_start (args, format); -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wformat-nonliteral" g_vsnprintf (message + len, sizeof (message) - len, format, args); -#pragma GCC diagnostic pop - va_end (args); /* See systemd.journal-fields(7) for the meaning of the |