Skip to contentSkip to conversation

lz4: Fix compile warning comparison of distinct pointer types

PATCH In review Pali Rohár 2 participants 2 messages Jul 27, 2022 – Aug 10, 2022 Library code

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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);
                  ^~~
---
 lib/lz4_wrapper.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
lib/lz4_wrapper.c +1 -1
index ebcb5c09a22c..5f8f5af012cf 100644
@@ -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) {
Signature · 1 line
2.20.1
#1 lore raw
Quoted 13 lines · 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);
                  ^~~
Quoted 1 line

Applied to u-boot/master, thanks!

Signature · 1 line
Tom