From bca48c9a6659cb855f985ab96e5de42ff239c0ff Mon Sep 17 00:00:00 2001
From: Serge Vakulenko <serge@vak.ru>
Date: Wed, 7 May 2014 20:57:09 -0700
Subject: [PATCH] Fixed size_t comparison in memxxx and strxxx finctions.

---
 src/libc/compat/memccpy.c | 2 +-
 src/libc/compat/memchr.c  | 2 +-
 src/libc/compat/memcmp.c  | 2 +-
 src/libc/compat/memcpy.c  | 2 +-
 src/libc/compat/memset.c  | 2 +-
 src/libc/gen/strcasecmp.c | 4 ++--
 src/libc/gen/strncat.c    | 2 +-
 src/libc/gen/strncpy.c    | 2 +-
 8 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/libc/compat/memccpy.c b/src/libc/compat/memccpy.c
index 2f8ca7e..be8790a 100644
--- a/src/libc/compat/memccpy.c
+++ b/src/libc/compat/memccpy.c
@@ -18,7 +18,7 @@ memccpy(vt, vf, c, n)
 	register char *t = vt;
 	register const char *f = vf;
 
-	while (--n >= 0)
+	while (n-- > 0)
 		if ((*t++ = *f++) == c)
 			return (t);
 	return (0);
diff --git a/src/libc/compat/memchr.c b/src/libc/compat/memchr.c
index 12597a9..a14df7e 100644
--- a/src/libc/compat/memchr.c
+++ b/src/libc/compat/memchr.c
@@ -16,7 +16,7 @@ memchr(vs, c, n)
 {
 	register const char *s = vs;
 
-	while (--n >= 0)
+	while (n-- > 0)
 		if (*s++ == c)
 			return (void*) --s;
 	return (0);
diff --git a/src/libc/compat/memcmp.c b/src/libc/compat/memcmp.c
index bca8b1c..519043b 100644
--- a/src/libc/compat/memcmp.c
+++ b/src/libc/compat/memcmp.c
@@ -15,7 +15,7 @@ memcmp (vs1, vs2, n)
 {
 	register const char *s1 = vs1, *s2 = vs2;
 
-	while (--n >= 0)
+	while (n-- > 0)
 		if (*s1++ != *s2++)
 			return (*--s1 - *--s2);
 	return (0);
diff --git a/src/libc/compat/memcpy.c b/src/libc/compat/memcpy.c
index a167c90..bc03276 100644
--- a/src/libc/compat/memcpy.c
+++ b/src/libc/compat/memcpy.c
@@ -17,7 +17,7 @@ memcpy (vt, vf, n)
 	register char *t = vt;
 	register const char *f = vf;
 
-	while (--n >= 0)
+	while (n-- > 0)
 		*t++ = *f++;
 
 	return vt;
diff --git a/src/libc/compat/memset.c b/src/libc/compat/memset.c
index 7fe2be0..3c474fa 100644
--- a/src/libc/compat/memset.c
+++ b/src/libc/compat/memset.c
@@ -16,7 +16,7 @@ memset (vs, c, n)
 {
 	register char *s = vs;
 
-	while (--n >= 0)
+	while (n-- > 0)
 		*s++ = c;
 
 	return vs;
diff --git a/src/libc/gen/strcasecmp.c b/src/libc/gen/strcasecmp.c
index 606ea9c..893a554 100644
--- a/src/libc/gen/strcasecmp.c
+++ b/src/libc/gen/strcasecmp.c
@@ -64,8 +64,8 @@ strncasecmp(s1, s2, n)
 {
 	register char *cm = charmap;
 
-	while (--n >= 0 && cm[(unsigned char)*s1] == cm[(unsigned char)*s2++])
+	while (n-- > 0 && cm[(unsigned char)*s1] == cm[(unsigned char)*s2++])
 		if (*s1++ == '\0')
 			return(0);
-	return(n < 0 ? 0 : cm[(unsigned char)*s1] - cm[(unsigned char)*--s2]);
+	return(n == 0 ? 0 : cm[(unsigned char)*s1] - cm[(unsigned char)*--s2]);
 }
diff --git a/src/libc/gen/strncat.c b/src/libc/gen/strncat.c
index 84ae4ef..3143dba 100644
--- a/src/libc/gen/strncat.c
+++ b/src/libc/gen/strncat.c
@@ -18,7 +18,7 @@ strncat(s1, s2, n)
 		;
 	--s1;
 	while ((*s1++ = *s2++))
-		if (--n < 0) {
+		if (n-- == 0) {
 			*--s1 = '\0';
 			break;
 		}
diff --git a/src/libc/gen/strncpy.c b/src/libc/gen/strncpy.c
index 33d68c3..9b07613 100644
--- a/src/libc/gen/strncpy.c
+++ b/src/libc/gen/strncpy.c
@@ -10,7 +10,7 @@ strncpy(s1, s2, n)
 	register const char *s2;
 	size_t n;
 {
-	register int i;
+	size_t i;
 	register char *os1;
 
 	os1 = s1;