X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Kernel%2Flib.c;h=586a2e8fb9d128d182b17ab5e1267950b1269d38;hb=a1b7b0fcbf99e2c53dd6d7ee5961772bf29bdb2b;hp=a7cffd63e53bc865e8f46ccafe2ec50d89c93715;hpb=30e30d7bc325852a8677819d11a47373b08d6271;p=tpg%2Facess2.git

diff --git a/Kernel/lib.c b/Kernel/lib.c
index a7cffd63..586a2e8f 100644
--- a/Kernel/lib.c
+++ b/Kernel/lib.c
@@ -232,7 +232,7 @@ int vsnprintf(char *__s, size_t __maxlen, const char *__format, va_list args)
 			pad = ' ';
 		
 		// - Minimum length
-		if(c == '*') {
+		if(c == '*') {	// Dynamic length
 			minSize = val;
 			val = va_arg(args, Uint);
 			c = *__format++;
@@ -270,14 +270,14 @@ int vsnprintf(char *__s, size_t __maxlen, const char *__format, va_list args)
 		{
 		case 'd':
 		case 'i':
-			#if BITS == 32
-			if( (isLongLong && val >> 63) || (!isLongLong && val >> 31) ) {
-			#else
-			if( (Sint)val < 0 ) {
-			#endif
+			if( isLongLong && val >> 63 ) {
 				PUTCH('-');
 				val = -val;
 			}
+			else if( !isLongLong && val >> 31 ) {
+				PUTCH('-');
+				val = -(Sint32)val;
+			}
 			itoa(p, val, 10, minSize, pad);
 			goto printString;
 		case 'u':
@@ -300,7 +300,7 @@ int vsnprintf(char *__s, size_t __maxlen, const char *__format, va_list args)
 		
 		// String - Null Terminated Array
 		case 's':
-			p = (char*)(Uint)val;
+			p = (char*)(tVAddr)val;
 		printString:
 			if(!p)		p = "(null)";
 			len = strlen(p);
@@ -310,7 +310,7 @@ int vsnprintf(char *__s, size_t __maxlen, const char *__format, va_list args)
 			break;
 		
 		case 'C':	// Non-Null Terminated Character Array
-			p = (char*)(Uint)val;
+			p = (char*)(tVAddr)val;
 			if(!p)	goto printString;
 			while(minSize--)	PUTCH(*p++);
 			break;