GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

libpayload/libc: Use size_t for lengths and indices 

size_t is the natural integer type for strlen() and array indices, and
this fixes several integer conversion and sign comparison warnings.

Change-Id: I5658b19f990de4596a602b36d9533b1ca96ad947
Signed-off-by: Jacob Garber <jgarber1@ualberta.ca>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/33794
Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net>
Reviewed-by: Julius Werner <jwerner@chromium.org>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
This commit is contained in:
Jacob Garber 2019-06-25 16:57:07 -06:00 committed by Patrick Georgi
parent c3feebb7f5
commit 5f914dc4ce
1 changed files with 38 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

78
payloads/libpayload/libc/string.c
View File

@ -91,9 +91,9 @@ size_t strlen(const char *str)
*/ */
int strcasecmp(const char *s1, const char *s2) int strcasecmp(const char *s1, const char *s2)
{ {
int i, res; int res;
for (i = 0; 1; i++) { for (size_t i = 0; 1; i++) {
res = tolower(s1[i]) - tolower(s2[i]); res = tolower(s1[i]) - tolower(s2[i]);
if (res || (s1[i] == '\0')) if (res || (s1[i] == '\0'))
break; break;
@ -112,10 +112,9 @@ int strcasecmp(const char *s1, const char *s2)
*/ */
int strncasecmp(const char *s1, const char *s2, size_t maxlen) int strncasecmp(const char *s1, const char *s2, size_t maxlen)
{ {
int i, res; int res = 0;
res = 0; for (size_t i = 0; i < maxlen; i++) {
for (i = 0; i < maxlen; i++) {
res = tolower(s1[i]) - tolower(s2[i]); res = tolower(s1[i]) - tolower(s2[i]);
if (res || (s1[i] == '\0')) if (res || (s1[i] == '\0'))
break; break;
@ -135,9 +134,9 @@ int strncasecmp(const char *s1, const char *s2, size_t maxlen)
*/ */
int strcmp(const char *s1, const char *s2) int strcmp(const char *s1, const char *s2)
{ {
int i, res; int res;
for (i = 0; 1; i++) { for (size_t i = 0; 1; i++) {
res = s1[i] - s2[i]; res = s1[i] - s2[i];
if (res || (s1[i] == '\0')) if (res || (s1[i] == '\0'))
break; break;
@ -156,10 +155,9 @@ int strcmp(const char *s1, const char *s2)
*/ */
int strncmp(const char *s1, const char *s2, size_t maxlen) int strncmp(const char *s1, const char *s2, size_t maxlen)
{ {
int i, res; int res = 0;
res = 0; for (size_t i = 0; i < maxlen; i++) {
for (i = 0; i < maxlen; i++) {
res = s1[i] - s2[i]; res = s1[i] - s2[i];
if (res || (s1[i] == '\0')) if (res || (s1[i] == '\0'))
break; break;
@ -179,10 +177,9 @@ int strncmp(const char *s1, const char *s2, size_t maxlen)
char *strncpy(char *d, const char *s, size_t n) char *strncpy(char *d, const char *s, size_t n)
{ {
/* Use +1 to get the NUL terminator. */ /* Use +1 to get the NUL terminator. */
int max = n > strlen(s) + 1 ? strlen(s) + 1 : n; size_t max = n > strlen(s) + 1 ? strlen(s) + 1 : n;
int i;
for (i = 0; i < max; i++) for (size_t i = 0; i < max; i++)
d[i] = (char)s[i]; d[i] = (char)s[i];
return d; return d;
@ -210,13 +207,12 @@ char *strcpy(char *d, const char *s)
char *strcat(char *d, const char *s) char *strcat(char *d, const char *s)
{ {
char *p = d + strlen(d); char *p = d + strlen(d);
int sl = strlen(s); size_t sl = strlen(s);
int i;
for (i = 0; i < sl; i++) for (size_t i = 0; i < sl; i++)
p[i] = s[i]; p[i] = s[i];
p[i] = '\0'; p[sl] = '\0';
return d; return d;
} }
@ -231,15 +227,13 @@ char *strcat(char *d, const char *s)
char *strncat(char *d, const char *s, size_t n) char *strncat(char *d, const char *s, size_t n)
{ {
char *p = d + strlen(d); char *p = d + strlen(d);
int sl = strlen(s); size_t sl = strlen(s);
int max = n > sl ? sl : n; size_t max = n > sl ? sl : n;
// int max = n > strlen(s) ? strlen(s) : n;
int i;
for (i = 0; i < max; i++) for (size_t i = 0; i < max; i++)
p[i] = s[i]; p[i] = s[i];
p[i] = '\0'; p[max] = '\0';
return d; return d;
} }
@ -253,17 +247,19 @@ char *strncat(char *d, const char *s, size_t n)
*/ */
size_t strlcat(char *d, const char *s, size_t n) size_t strlcat(char *d, const char *s, size_t n)
{ {
int sl = strlen(s); size_t sl = strlen(s);
int dl = strlen(d); size_t dl = strlen(d);
if (n <= dl + 1)
return sl + dl;
char *p = d + dl; char *p = d + dl;
int max = n > (sl + dl) ? sl : (n - dl - 1); size_t max = n > (sl + dl) ? sl : (n - dl - 1);
int i;
for (i = 0; i < max; i++) for (size_t i = 0; i < max; i++)
p[i] = s[i]; p[i] = s[i];
p[i] = '\0'; p[max] = '\0';
return sl + dl; return sl + dl;
} }
@ -316,7 +312,7 @@ char *strrchr(const char *s, int c)
*/ */
char *strdup(const char *s) char *strdup(const char *s)
{ {
int n = strlen(s); size_t n = strlen(s);
char *p = malloc(n + 1); char *p = malloc(n + 1);
if (p != NULL) { if (p != NULL) {
@ -336,11 +332,13 @@ char *strdup(const char *s)
*/ */
char *strstr(const char *h, const char *n) char *strstr(const char *h, const char *n)
{ {
int hn = strlen(h); size_t hn = strlen(h);
int nn = strlen(n); size_t nn = strlen(n);
int i;
for (i = 0; i <= hn - nn; i++) if (hn < nn)
return NULL;
for (size_t i = 0; i <= hn - nn; i++)
if (!memcmp(&h[i], n, nn)) if (!memcmp(&h[i], n, nn))
return (char *)&h[i]; return (char *)&h[i];
@ -532,11 +530,11 @@ unsigned long int strtoul(const char *ptr, char **endptr, int base)
*/ */
size_t strspn(const char *s, const char *a) size_t strspn(const char *s, const char *a)
{ {
int i, j; size_t i;
int al = strlen(a); size_t al = strlen(a);
for (i = 0; s[i] != 0; i++) { for (i = 0; s[i] != 0; i++) {
int found = 0; int found = 0;
for (j = 0; j < al; j++) { for (size_t j = 0; j < al; j++) {
if (s[i] == a[j]) { if (s[i] == a[j]) {
found = 1; found = 1;
break; break;
@ -556,11 +554,11 @@ size_t strspn(const char *s, const char *a)
*/ */
size_t strcspn(const char *s, const char *a) size_t strcspn(const char *s, const char *a)
{ {
int i, j; size_t i;
int al = strlen(a); size_t al = strlen(a);
for (i = 0; s[i] != 0; i++) { for (i = 0; s[i] != 0; i++) {
int found = 0; int found = 0;
for (j = 0; j < al; j++) { for (size_t j = 0; j < al; j++) {
if (s[i] == a[j]) { if (s[i] == a[j]) {
found = 1; found = 1;
break; break;