aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonas Karlman <jonas@kwiboo.se>2023-07-22 14:02:13 +0000
committerKever Yang <kever.yang@rock-chips.com>2023-07-28 18:45:03 +0800
commit8c1bb04b5699ce74ad727d4513e1a40a58c9c628 (patch)
tree0623246cddb67b95ddb8bac04152a4a4020dfc58
parent7af6616c961d213b4bf2cc88003cbd868ea11ffa (diff)
downloadu-boot-8c1bb04b5699ce74ad727d4513e1a40a58c9c628.zip
u-boot-8c1bb04b5699ce74ad727d4513e1a40a58c9c628.tar.gz
u-boot-8c1bb04b5699ce74ad727d4513e1a40a58c9c628.tar.bz2
cmd: ini: Fix build warning
Building U-Boot with CMD_INI=y result in following build warning: cmd/ini.c: In function 'memgets': include/linux/kernel.h:184:24: warning: comparison of distinct pointer types lacks a cast 184 | (void) (&_min1 == &_min2); \ | ^~ cmd/ini.c:92:15: note: in expansion of macro 'min' 92 | len = min((end - *mem) + newline, num); | ^~~ Fix this by adding an int cast to the pointer arithmetic result. Signed-off-by: Jonas Karlman <jonas@kwiboo.se> Reviewed-by: Kever Yang <kever.yang@rock-chips.com>
-rw-r--r--cmd/ini.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/cmd/ini.c b/cmd/ini.c
index 81dfc4c..35de237 100644
--- a/cmd/ini.c
+++ b/cmd/ini.c
@@ -89,7 +89,7 @@ static char *memgets(char *str, int num, char **mem, size_t *memsize)
end = *mem + *memsize;
newline = 0;
}
- len = min((end - *mem) + newline, num);
+ len = min((int)(end - *mem) + newline, num);
memcpy(str, *mem, len);
if (len < num)
str[len] = '\0';