From 28daaa40da8e1114aed36ee51818f6e71a80a5e2 Mon Sep 17 00:00:00 2001
From: Peter Pentchev <roam@debian.org>
Date: Fri, 12 Aug 2022 11:29:20 +0300
Subject: [PATCH] Add the cppcheck patch to fix some minor issues.

---
 debian/patches/cppcheck.patch | 98 +++++++++++++++++++++++++++++++++++
 debian/patches/series         |  1 +
 2 files changed, 99 insertions(+)
 create mode 100644 debian/patches/cppcheck.patch

diff --git a/debian/patches/cppcheck.patch b/debian/patches/cppcheck.patch
new file mode 100644
index 0000000..5debaf9
--- /dev/null
+++ b/debian/patches/cppcheck.patch
@@ -0,0 +1,98 @@
+Description: Fix a couple of issues reported by cppcheck.
+Forwarded: no
+Author: Peter Pentchev <roam@ringlet.net>
+Last-Update: 2022-08-12
+
+--- a/src/lib/comp/nocomp/nocomp.c
++++ b/src/lib/comp/nocomp/nocomp.c
+@@ -49,7 +49,7 @@
+     ALLOCD_INT(zck, comp);
+ 
+     *dst = zmalloc(src_size);
+-    if (!dst) {
++    if (!*dst) {
+         zck_log(ZCK_LOG_ERROR, "OOM in %s", __func__);
+         return 0;
+     }
+--- a/src/lib/comp/zstd/zstd.c
++++ b/src/lib/comp/zstd/zstd.c
+@@ -144,7 +144,7 @@
+     }
+ 
+     *dst = zmalloc(max_size);
+-    if (!dst) {
++    if (!*dst) {
+         zck_log(ZCK_LOG_ERROR, "OOM in %s", __func__);
+         return false;
+     }
+--- a/src/lib/hash/hash.c
++++ b/src/lib/hash/hash.c
+@@ -313,7 +313,7 @@
+         unsigned char *digest = zmalloc(SHA1_DIGEST_LENGTH);
+         if (!digest) {
+            zck_log(ZCK_LOG_ERROR, "OOM in %s", __func__);
+-           return false;
++           return NULL;
+         }
+         SHA1_Final((sha1_byte*)digest, (SHA_CTX *)hash->ctx);
+         hash_close(hash);
+@@ -322,7 +322,7 @@
+         unsigned char *digest = zmalloc(SHA256_DIGEST_SIZE);
+         if (!digest) {
+            zck_log(ZCK_LOG_ERROR, "OOM in %s", __func__);
+-           return false;
++           return NULL;
+         }
+         SHA256_Final(digest, (SHA256_CTX *)hash->ctx);
+         hash_close(hash);
+@@ -332,7 +332,7 @@
+         unsigned char *digest = zmalloc(SHA512_DIGEST_SIZE);
+         if (!digest) {
+            zck_log(ZCK_LOG_ERROR, "OOM in %s", __func__);
+-           return false;
++           return NULL;
+         }
+         SHA512_Final(digest, (SHA512_CTX *)hash->ctx);
+         hash_close(hash);
+--- a/src/lib/header.c
++++ b/src/lib/header.c
+@@ -339,13 +339,13 @@
+     int phs = 5 + 2*MAX_COMP_SIZE + zck->hash_type.digest_size;
+     char *header = zmalloc(phs);
+     size_t length = 0;
+-    memcpy(header, "\0ZCK1", 5);
+-    length += 5;
+ 
+     if (!header) {
+ 	    zck_log(ZCK_LOG_ERROR, "OOM in %s", __func__);
+ 	    return false;
+     }
++    memcpy(header, "\0ZCK1", 5);
++    length += 5;
+     /* Write out full data and header hash type */
+     compint_from_size(header + length, zck->hash_type.type, &length);
+     /* Write out header length */
+--- a/src/lib/zck.c
++++ b/src/lib/zck.c
+@@ -413,7 +413,7 @@
+     zckCtx *zck = zmalloc(sizeof(zckCtx));
+     if (!zck) {
+        zck_log(ZCK_LOG_ERROR, "OOM in %s", __func__);
+-       return false;
++       return NULL;
+     }
+     zck_clear_error(NULL);
+     zck->prep_hash_type = -1;
+--- a/test/zck_cmp_uncomp.c
++++ b/test/zck_cmp_uncomp.c
+@@ -232,8 +232,8 @@
+         iter = zck_get_next_chunk(iter);
+     }
+ 
+-    printf("\n\nTotal to be reused : %12lu\n", reuse);
+-    printf("Total to be downloaded : %12lu\n", todwl);
++    printf("\n\nTotal to be reused : %12zu\n", reuse);
++    printf("Total to be downloaded : %12zu\n", todwl);
+ 
+     close(in_fd);
+     close(zck_fd);
diff --git a/debian/patches/series b/debian/patches/series
index c7d7dd6..a18cf92 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 typos.patch
 test-checksums.patch
+cppcheck.patch
-- 
2.30.2