From: Jonathan Dieter <jdieter@gmail.com>
Date: Wed, 7 Aug 2019 21:28:50 +0000 (+0100)
Subject: Fix coverity warnings
X-Git-Tag: archive/raspbian/1.1.9+ds1-1+rpi1~1^2~36
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=b1b132962120ce19960c11ba88b12ed299b4a55e;p=zchunk.git

Fix coverity warnings

Signed-off-by: Jonathan Dieter <jdieter@gmail.com>
---

diff --git a/meson.build b/meson.build
index a554865..4a7d7e9 100644
--- a/meson.build
+++ b/meson.build
@@ -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
diff --git a/src/lib/zck.c b/src/lib/zck.c
index dc4e183..f4ce884 100644
--- a/src/lib/zck.c
+++ b/src/lib/zck.c
@@ -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;
         }