]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
fstab-generator: quiesce false-positive -Werror=format-nonliteral (#5336)
authorMartin Pitt <martinpitt@users.noreply.github.com>
Tue, 14 Feb 2017 01:58:22 +0000 (02:58 +0100)
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Tue, 14 Feb 2017 01:58:22 +0000 (20:58 -0500)
Commit ae3251851 changed the fprintf() format argument into a variable
which triggers a gcc 6.3 warning/error:

  src/fstab-generator/fstab-generator.c:243:17: error: format not a string literal,
  argument types not checked [-Werror=format-nonliteral]
                 fprintf(f, format, res);

This is a false positive, as the function is only being called with
constant (not user-definable) arguments which are valid format strings.

src/fstab-generator/fstab-generator.c

index c38a5aa2572a43c06e5a667f7e31e51b7c91de4b..2677a3fb3212b78686efaba623303d315d310ca4 100644 (file)
@@ -240,7 +240,10 @@ static int write_dependency(FILE *f, const char *opts,
                 res = strv_join(units, " ");
                 if (!res)
                         return log_oom();
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wformat-nonliteral"
                 fprintf(f, format, res);
+#pragma GCC diagnostic pop
         }
 
         return 0;