X-Git-Url: https://git.saurik.com/apple/xnu.git/blobdiff_plain/6d2010ae8f7a6078e10b361c6962983bab233e0f..d26ffc64f583ab2d29df48f13518685602bc8832:/libsyscall/mach/string.c

diff --git a/libsyscall/mach/string.c b/libsyscall/mach/string.c
index 000a0f88f..8dca9927c 100644
--- a/libsyscall/mach/string.c
+++ b/libsyscall/mach/string.c
@@ -36,7 +36,7 @@ _mach_strlen(const char *str)
 	const char *p;
 	for (p = str; p; p++) {
 		if (*p == '\0') {
-			return (p - str);
+			return (int)(p - str);
 		}
 	}
 	/* NOTREACHED */
@@ -104,8 +104,9 @@ _mach_vsnprintf(char *buffer, int length, const char *fmt, va_list ap)
 			}
 		}
 	}
-	*out_ptr = '\0';
-	return max - length;
+	if (max > 0)
+		*out_ptr = '\0';
+	return max - (length + 1); /* don't include the final NULL in the return value */
 }
 
 int