]> git.baikalelectronics.ru Git - uboot.git/commitdiff
lz4: Fix compile warning comparison of distinct pointer types
authorPali Rohár <pali@kernel.org>
Wed, 27 Jul 2022 15:24:23 +0000 (17:24 +0200)
committerTom Rini <trini@konsulko.com>
Wed, 10 Aug 2022 17:46:55 +0000 (13:46 -0400)
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

index 0d2a3655a8afffa6aa4ac12c980d071c61092084..67dea2ff39043925d77ab273b02bf86259e14836 100644 (file)
@@ -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) {