Fix coverity warnings
authorJonathan Dieter <jdieter@gmail.com>
Wed, 7 Aug 2019 21:28:50 +0000 (22:28 +0100)
committerJonathan Dieter <jdieter@gmail.com>
Wed, 7 Aug 2019 21:28:50 +0000 (22:28 +0100)
Signed-off-by: Jonathan Dieter <jdieter@gmail.com>
meson.build
src/lib/zck.c

index a554865ef4164bf994b8ed784484d48e630eb40f..4a7d7e942090abf8360e2059fea7ef44f3aba576 100644 (file)
@@ -11,15 +11,6 @@ common_cflags = [
 cc = meson.get_compiler('c')
 add_project_arguments(cc.get_supported_arguments(common_cflags), language : 'c')
 
-# Fix coverity bug, shamelessly stolen from libinput
-if get_option('coverity')
-    add_project_arguments('-D_Float128=__uint128_t', language : 'c')
-    add_project_arguments('-D_Float32x=int', language : 'c')
-    add_project_arguments('-D_Float32=int', language : 'c')
-    add_project_arguments('-D_Float64x=long', language : 'c')
-    add_project_arguments('-D_Float64=long', language : 'c')
-endif
-
 if get_option('with-zstd') == 'disabled'
     zstd_dep = dependency('', required : false)
 else
index dc4e183cab2c7407a92d926ec239393320ed0717..f4ce8844fd6479c8bc56337805a13f1fc6303cd1 100644 (file)
@@ -224,7 +224,7 @@ bool PUBLIC zck_set_soption(zckCtx *zck, zck_soption option, const char *value,
             free(data);
             set_fatal_error(zck, "Hash digest size mismatch for header "
                                  "validation\n"
-                                 "Expected: %lu\nProvided: %lu",
+                                 "Expected: %i\nProvided: %lu",
                                  chk_type.digest_size*2, length);
             return false;
         }