X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=KernelLand%2FKernel%2Flibc.c;h=2950782453180f8ec63d564a7ac88e69793e0434;hb=6267c32524bc76488a14c5b71e0e8eededce31db;hp=b0c083b02ac7b9a4d01dbfc4c0aab615c30b78b2;hpb=e7a76b0d8a0cc6aa77966509780973a6f8216ef7;p=tpg%2Facess2.git

diff --git a/KernelLand/Kernel/libc.c b/KernelLand/Kernel/libc.c
index b0c083b0..29507824 100644
--- a/KernelLand/Kernel/libc.c
+++ b/KernelLand/Kernel/libc.c
@@ -187,8 +187,8 @@ void itoa(char *buf, Uint64 num, int base, int minLength, char pad)
  * \brief Append a character the the vsnprintf output
  */
 #define PUTCH(ch)	do { \
-		if(pos < __maxlen) { \
-			if(__s) __s[pos] = ch; \
+		if(pos < __maxlen && __s) { \
+			__s[pos] = ch; \
 		} else { \
 			(void)ch;\
 		} \
@@ -201,7 +201,7 @@ void itoa(char *buf, Uint64 num, int base, int minLength, char pad)
 /**
  * \brief VArg String Number Print Formatted
  */
-int vsnprintf(char *__s, size_t __maxlen, const char *__format, va_list args)
+int vsnprintf(char *__s, const size_t __maxlen, const char *__format, va_list args)
 {
 	char	c, pad = ' ';
 	 int	minSize = 0, precision = -1, len;
@@ -404,7 +404,7 @@ int vsnprintf(char *__s, size_t __maxlen, const char *__format, va_list args)
 		}
 	}
 	
-	if(__s && pos != __maxlen)
+	if(__s && pos < __maxlen)
 		__s[pos] = '\0';
 	
 	return pos;