From 5e44b7cdfc5eb4b9bc7ab9d43291403fcc05de87 Mon Sep 17 00:00:00 2001 From: Gary Lockyer Date: Fri, 1 May 2020 11:41:08 +1200 Subject: [PATCH] Fix clang 9 constant-conversion warnings Signed-off-by: Gary Lockyer Reviewed-by: Andreas Schneider --- buildtools/wafsamba/samba_autoconf.py | 1 - source4/torture/ndr/dnsp.c | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/buildtools/wafsamba/samba_autoconf.py b/buildtools/wafsamba/samba_autoconf.py index caa97b8e868..339ad4a708a 100644 --- a/buildtools/wafsamba/samba_autoconf.py +++ b/buildtools/wafsamba/samba_autoconf.py @@ -796,7 +796,6 @@ int main(void) { conf.ADD_NAMED_CFLAGS('PICKY_CFLAGS', '-Wno-error=missing-field-initializers', testflags=True) conf.ADD_NAMED_CFLAGS('PICKY_CFLAGS', '-Wno-error=unused-function', testflags=True) conf.ADD_NAMED_CFLAGS('PICKY_CFLAGS', '-Wno-error=enum-conversion', testflags=True) - conf.ADD_NAMED_CFLAGS('PICKY_CFLAGS', '-Wno-error=constant-conversion', testflags=True) if Options.options.fatal_errors: conf.ADD_CFLAGS('-Wfatal-errors', testflags=True) diff --git a/source4/torture/ndr/dnsp.c b/source4/torture/ndr/dnsp.c index 3d0cd942d11..3fc58c9429e 100644 --- a/source4/torture/ndr/dnsp.c +++ b/source4/torture/ndr/dnsp.c @@ -332,7 +332,7 @@ static bool dnsp_dnsProperty_deleted_by_check(struct torture_context *tctx, torture_assert_int_equal(tctx, r->version, 1, "version"); torture_assert_int_equal(tctx, r->id, DSPROPERTY_ZONE_DELETED_FROM_HOSTNAME, "id"); torture_assert_str_equal(tctx, r->data.deleted_by_hostname, "w2k3-191.w2k3.base", "hostname"); - torture_assert_int_equal(tctx, r->name, 4092359108, "name (random)"); + torture_assert_int_equal(tctx, r->name, 0xf3ec71c4, "name (random)"); return true; } -- 2.34.1