Elyes Haouas has submitted this change. ( https://review.coreboot.org/c/coreboot/+/83222?usp=email )
Change subject: lib/string: change parameter types to match C standard ......................................................................
lib/string: change parameter types to match C standard
The third parameter of strncpy and strncmp is supposed to be a size_t and not a signed int.
Signed-off-by: Felix Held felix-coreboot@felixheld.de Change-Id: I485e45e18232a0d1625d4d626f923ec66cfbe4a2 Reviewed-on: https://review.coreboot.org/c/coreboot/+/83222 Reviewed-by: Matt DeVillier matt.devillier@gmail.com Tested-by: build bot (Jenkins) no-reply@coreboot.org Reviewed-by: Varshit Pandya pandyavarshit@gmail.com Reviewed-by: Marshall Dawson marshalldawson3rd@gmail.com Reviewed-by: Elyes Haouas ehaouas@noos.fr --- M src/include/string.h M src/lib/string.c 2 files changed, 4 insertions(+), 4 deletions(-)
Approvals: build bot (Jenkins): Verified Elyes Haouas: Looks good to me, approved Marshall Dawson: Looks good to me, approved Varshit Pandya: Looks good to me, but someone else must approve Matt DeVillier: Looks good to me, approved
diff --git a/src/include/string.h b/src/include/string.h index e752f8f..dc301ea 100644 --- a/src/include/string.h +++ b/src/include/string.h @@ -16,10 +16,10 @@ size_t strnlen(const char *src, size_t max); size_t strlen(const char *src); char *strchr(const char *s, int c); -char *strncpy(char *to, const char *from, int count); +char *strncpy(char *to, const char *from, size_t count); char *strcpy(char *dst, const char *src); int strcmp(const char *s1, const char *s2); -int strncmp(const char *s1, const char *s2, int maxlen); +int strncmp(const char *s1, const char *s2, size_t maxlen); int strspn(const char *str, const char *spn); int strcspn(const char *str, const char *spn); char *strstr(const char *haystack, const char *needle); diff --git a/src/lib/string.c b/src/lib/string.c index d23ed1f..7553295 100644 --- a/src/lib/string.c +++ b/src/lib/string.c @@ -71,7 +71,7 @@ return p; }
-char *strncpy(char *to, const char *from, int count) +char *strncpy(char *to, const char *from, size_t count) { char *ret = to; char data; @@ -113,7 +113,7 @@ return r; }
-int strncmp(const char *s1, const char *s2, int maxlen) +int strncmp(const char *s1, const char *s2, size_t maxlen) { int i;