mirror of
https://github.com/Zeal-Operating-System/ZealOS.git
synced 2025-04-14 19:58:37 +01:00
Merge branch 'master' into ignore-hidden
This commit is contained in:
commit
6bc514c70d
3 changed files with 5 additions and 4 deletions
src
|
@ -129,5 +129,5 @@ $FG$
|
||||||
* No args are passed in registers.
|
* No args are passed in registers.
|
||||||
|
|
||||||
* RAX holds function return values, of course.
|
* RAX holds function return values, of course.
|
||||||
$FG,8$
|
|
||||||
* "MagicISO" is a trademark owned by MagicISO Corp.
|
|
||||||
|
|
|
@ -212,7 +212,7 @@ U8 *FlagsStrPrint(U8 *dst, U8 *list, I64 flags, Bool print_all=FALSE, I64 print_
|
||||||
I64 i = 0;
|
I64 i = 0;
|
||||||
|
|
||||||
*dst = 0;
|
*dst = 0;
|
||||||
if (!print_all_length)
|
if (!print_all_length || print_all_length > 64)
|
||||||
print_all_length = 64;
|
print_all_length = 64;
|
||||||
while (i < print_all_length)
|
while (i < print_all_length)
|
||||||
{
|
{
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
I64 Str2I64(U8 *st, I64 radix=10, U8 **_end_ptr=NULL)
|
I64 Str2I64(U8 *st, I64 radix=10, U8 **_end_ptr=NULL)
|
||||||
{//String to I64. Similar to strtoul().
|
{//String to I64. Similar to strtol().
|
||||||
//Allows radix change with "0x20" "0b1010" "0d123" "0o18".
|
//Allows radix change with "0x20" "0b1010" "0d123" "0o18".
|
||||||
//Be careful of Str2I64("0b101", 16)-->0xB101.
|
//Be careful of Str2I64("0b101", 16)-->0xB101.
|
||||||
Bool neg = FALSE;
|
Bool neg = FALSE;
|
||||||
|
@ -32,6 +32,7 @@ I64 Str2I64(U8 *st, I64 radix=10, U8 **_end_ptr=NULL)
|
||||||
switch (ch)
|
switch (ch)
|
||||||
{
|
{
|
||||||
case 'B': radix = 2; st++; break;
|
case 'B': radix = 2; st++; break;
|
||||||
|
case 'O': radix = 8; st++; break;
|
||||||
case 'D': radix = 10; st++; break;
|
case 'D': radix = 10; st++; break;
|
||||||
case 'X': radix = 16; st++; break;
|
case 'X': radix = 16; st++; break;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue