From eb3573c8f9f44c052c6ba10a391ac4605198d7cd Mon Sep 17 00:00:00 2001 From: David Cohen Date: Wed, 9 Jan 2008 23:26:06 -0400 Subject: [PATCH] LIBC: Fixing warnings and missing semi-colons and adding stddef.h header. This patch fixes warnings and missing semi-colons and adds stddef.h header, needed by size_t type, on string.c's functions. Signed-off-by: David Cohen --- include/libc/string.h | 6 ++++-- lib/libc/string.c | 6 +++--- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/include/libc/string.h b/include/libc/string.h index ce7c7db..c97a83e 100644 --- a/include/libc/string.h +++ b/include/libc/string.h @@ -22,8 +22,10 @@ #ifndef __TINYX_LIBC_STRING_H #define __TINYX_LIBC_STRING_H -void *memset(void *mem, int data, size_t count) -void *memcpy(void *dest, const void *src, size_t count) +#include + +void *memset(void *mem, int data, size_t count); +void *memcpy(void *dest, const void *src, size_t count); char *strcat(char *str1, const char *str2); char *strchr(const char *str, int ch); int strcoll(const char *str1, const char *str2); diff --git a/lib/libc/string.c b/lib/libc/string.c index 0b9be1c..1a26851 100644 --- a/lib/libc/string.c +++ b/lib/libc/string.c @@ -75,7 +75,7 @@ char *strcat(char *str1, const char *str2) */ char *strchr(const char *str, int ch) { - for (; *str != (char)ch; ++s) + for (; *str != (char)ch; ++str) if (*str == '\0') return NULL; return (char *)str; @@ -123,7 +123,7 @@ char *strcpy(char *str1, const char *str2) { char *tmp = str1; - while ((*str1++ = *str2++) != '\0') + while ((*str1++ = *str2++) != '\0'); return tmp; } @@ -172,7 +172,7 @@ char *strncat(char *str1, const char *str2, size_t count) */ int strncmp(const char *str1, const char *str2, size_t count) { - signed char ret; + signed char ret = 0; while (count) { if ((ret = *str1 - *str2++) != 0 || !*str1++) -- 2.11.4.GIT