[systemd-commits] src/kmod-setup.c src/modules-load.c

Lennart Poettering lennart at kemper.freedesktop.org
Wed Feb 8 16:24:52 PST 2012


 src/kmod-setup.c   |    4 +++-
 src/modules-load.c |    3 +++
 2 files changed, 6 insertions(+), 1 deletion(-)

New commits:
commit cdb454f2def68ad08ed46e111dd698747b7adc6e
Author: Lennart Poettering <lennart at poettering.net>
Date:   Thu Feb 9 01:24:40 2012 +0100

    kmod: make GCC shut up

diff --git a/src/kmod-setup.c b/src/kmod-setup.c
index 7042de4..dc35156 100644
--- a/src/kmod-setup.c
+++ b/src/kmod-setup.c
@@ -36,12 +36,14 @@ static const char * const kmod_table[] = {
         "unix",    "/proc/net/unix"
 };
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wformat-nonliteral"
 static void systemd_kmod_log(void *data, int priority, const char *file, int line,
                              const char *fn, const char *format, va_list args)
 {
         log_meta(priority, file, line, fn, format, args);
 }
-
+#pragma GCC diagnostic pop
 
 int kmod_setup(void) {
         unsigned i;
diff --git a/src/modules-load.c b/src/modules-load.c
index 3adbd36..a1cbd00 100644
--- a/src/modules-load.c
+++ b/src/modules-load.c
@@ -32,11 +32,14 @@
 #include "util.h"
 #include "strv.h"
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wformat-nonliteral"
 static void systemd_kmod_log(void *data, int priority, const char *file, int line,
                              const char *fn, const char *format, va_list args)
 {
         log_meta(priority, file, line, fn, format, args);
 }
+#pragma GCC diagnostic pop
 
 int main(int argc, char *argv[]) {
         int r = EXIT_FAILURE;



More information about the systemd-commits mailing list