[PATCH] lz4: Fix compile warning comparison of distinct pointer types

[PATCH] lz4: Fix compile warning comparison of distinct pointer types

[Pali Rohár]

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>
---
 lib/lz4_wrapper.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/lz4_wrapper.c b/lib/lz4_wrapper.c
index ebcb5c09a22c..5f8f5af012cf 100644
--- a/lib/lz4_wrapper.c
+++ b/lib/lz4_wrapper.c
@@ -101,7 +101,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) {
-- 
2.20.1

Re: [PATCH] lz4: Fix compile warning comparison of distinct pointer types

[Tom Rini]

[-- Attachment #1: Type: text/plain, Size: 754 bytes --]

On Wed, Jul 27, 2022 at 05:24:23PM +0200, Pali Rohár wrote:

> 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>

Applied to u-boot/master, thanks!

-- 
Tom

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 659 bytes --]