Fix clang 9 format-nonliteral warnings

Signed-off-by: Gary Lockyer <gary@catalyst.net.nz>
Reviewed-by: Andreas Schneider <asn@samba.org>

diff --git a/buildtools/wafsamba/samba_autoconf.py b/buildtools/wafsamba/samba_autoconf.py
index 1533ff0c46d7b7f19cad1cdeb109efd26d1c3d7e..875fb394d5165712149a03e75ad8410b0f79e838 100644 (file)
--- a/buildtools/wafsamba/samba_autoconf.py
+++ b/buildtools/wafsamba/samba_autoconf.py
@@ -791,7 +791,6 @@ int main(void) {
             conf.ADD_NAMED_CFLAGS('PICKY_CFLAGS', '-Werror -Wno-error=deprecated-declarations', testflags=True)
             conf.ADD_NAMED_CFLAGS('PICKY_CFLAGS', '-Wno-error=tautological-compare', testflags=True)
             conf.ADD_NAMED_CFLAGS('PICKY_CFLAGS', '-Wno-error=cast-align', testflags=True)
-            conf.ADD_NAMED_CFLAGS('PICKY_CFLAGS', '-Wno-error=format-nonliteral', testflags=True)
             conf.ADD_NAMED_CFLAGS('PICKY_CFLAGS', '-Wno-error=for-loop-analysis', testflags=True)
 
     if Options.options.fatal_errors:

diff --git a/lib/ldb/tests/ldb_mod_op_test.c b/lib/ldb/tests/ldb_mod_op_test.c
index 0aa9ac2ce2712ac71467e6bb591a987badcf549c..cf40fe42b73c790df5d0673c478c1d4c5e226d93 100644 (file)
--- a/lib/ldb/tests/ldb_mod_op_test.c
+++ b/lib/ldb/tests/ldb_mod_op_test.c
@@ -3745,8 +3745,10 @@ static void test_ldb_add_to_index_unique_values_required(void **state)
        talloc_free(tmp_ctx);
 }
 
-static void ldb_debug_string(void *context, enum ldb_debug_level level,
-                            const char *fmt, va_list ap)
+static void PRINTF_ATTRIBUTE(3, 0) ldb_debug_string(
+       void *context,
+       enum ldb_debug_level level,
+       const char *fmt, va_list ap)
 {
        struct ldbtest_ctx *test_ctx =
                talloc_get_type_abort(context, struct ldbtest_ctx);

diff --git a/source3/modules/vfs_virusfilter_utils.c b/source3/modules/vfs_virusfilter_utils.c
index 0ee17ef7479ae63305c75e461959967becdbc9f4..c7f8089ffc733cb3d35396677fa98ffef4039719 100644 (file)
--- a/source3/modules/vfs_virusfilter_utils.c
+++ b/source3/modules/vfs_virusfilter_utils.c
@@ -397,7 +397,7 @@ bool virusfilter_io_writel(
        return virusfilter_io_write(io_h, io_h->w_eol, io_h->w_eol_size);
 }
 
-bool virusfilter_io_writefl(
+bool PRINTF_ATTRIBUTE(2, 3) virusfilter_io_writefl(
        struct virusfilter_io_handle *io_h,
        const char *data_fmt, ...)
 {
@@ -420,7 +420,7 @@ bool virusfilter_io_writefl(
        return virusfilter_io_write(io_h, data, data_size);
 }
 
-bool virusfilter_io_vwritefl(
+bool PRINTF_ATTRIBUTE(2, 0) virusfilter_io_vwritefl(
        struct virusfilter_io_handle *io_h,
        const char *data_fmt, va_list ap)
 {
@@ -670,7 +670,7 @@ bool virusfilter_io_readl(TALLOC_CTX *ctx,
        return ok;
 }
 
-bool virusfilter_io_writefl_readl(
+bool PRINTF_ATTRIBUTE(3, 4) virusfilter_io_writefl_readl(
        struct virusfilter_io_handle *io_h,
        char **read_line,
        const char *fmt, ...)

diff --git a/source4/dsdb/common/util.c b/source4/dsdb/common/util.c
index d88688a8ec1ed4a1b565d3fae357ce9d1b2108bb..ef03782f5889a6360fd35c1d0885461b0c7742a7 100644 (file)
--- a/source4/dsdb/common/util.c
+++ b/source4/dsdb/common/util.c
@@ -5870,7 +5870,7 @@ static int dsdb_count_domain_callback(
  *
  * @return LDB_STATUS code.
  */
-int dsdb_domain_count(
+int PRINTF_ATTRIBUTE(6, 7) dsdb_domain_count(
        struct ldb_context *ldb,
        size_t *count,
        struct ldb_dn *base,