From: Pali Rohár <pali@kernel.org>
Date: Wed, 27 Jul 2022 15:24:23 +0000 (+0200)
Subject: lz4: Fix compile warning comparison of distinct pointer types
X-Git-Tag: baikal/mips/sdk5.8.2~5^2~255^2~1
X-Git-Url: https://git.baikalelectronics.ru/?a=commitdiff_plain;h=046c9e6f2c3dacf2cce5681aef9ea76beaed45b9;p=uboot.git

lz4: Fix compile warning comparison of distinct pointer types

In file included from include/linux/bitops.h:22,
                 from include/log.h:15,
                 from include/linux/printk.h:4,
                 from include/common.h:20,
                 from lib/lz4_wrapper.c:6:
lib/lz4_wrapper.c: In function ‘ulz4fn’:
include/linux/kernel.h:184:17: warning: comparison of distinct pointer types lacks a cast
  (void) (&_min1 == &_min2);  \
                 ^~
lib/lz4_wrapper.c:104:18: note: in expansion of macro ‘min’
    size_t size = min((ptrdiff_t)block_size, end - out);
                  ^~~

Signed-off-by: Pali Rohár <pali@kernel.org>
---

diff --git a/lib/lz4_wrapper.c b/lib/lz4_wrapper.c
index 0d2a3655a8..67dea2ff39 100644
--- a/lib/lz4_wrapper.c
+++ b/lib/lz4_wrapper.c
@@ -80,7 +80,7 @@ int ulz4fn(const void *src, size_t srcn, void *dst, size_t *dstn)
 		}
 
 		if (block_header & LZ4F_BLOCKUNCOMPRESSED_FLAG) {
-			size_t size = min((ptrdiff_t)block_size, end - out);
+			size_t size = min((ptrdiff_t)block_size, (ptrdiff_t)(end - out));
 			memcpy(out, in, size);
 			out += size;
 			if (size < block_size) {