Merge pull request #146 from mknos/strscan_memcopy

StrScan(): Copy into new buffer with MemCopy() instead of loop
Zeal-Operating-System · Mar 11, 2024 · cd46dc4 · cd46dc4
2 parents d77e526 + 8f9d48b
commit cd46dc4
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/src/Kernel/KGlobals.ZC b/src/Kernel/KGlobals.ZC
@@ -14,7 +14,7 @@ U8		*rev_bits_table; //Table with U8 bits reversed
 CDate	 local_time_offset;
 F64		*pow10_I64,
 		 sys_os_version = 2.03;
-U64		 sys_os_version_sub = 116;
+U64		 sys_os_version_sub = 117;
 U8		*sys_os_version_str;
 U8		*sys_os_version_full;
 U8		*sys_os_version_nice;

diff --git a/src/Kernel/StrScan.ZC b/src/Kernel/StrScan.ZC
@@ -242,7 +242,7 @@ and take address.
 */
 	U8	*buf, *ptr, **pptr;
 	Bool left_justify = FALSE;
-	I64  ch, cur_arg = 0, i, len, *i_ptr, dec_len;
+	I64  ch, cur_arg = 0, len, *i_ptr, dec_len;
 	F64 *d_ptr;
 
 	if (!format)
@@ -301,9 +301,9 @@ and take address.
 					}
 				}
 				buf = MAlloc(len + 1);
-				for (i = 0; i < len; i++)
-					buf[i] = *src++;
-				buf[i] = 0;
+				MemCopy(buf, src, len);
+				buf[len] = 0;
+				src += len;
 				switch (ch)
 				{
 					case 's':