uefi-ref/gnu-efi
1
0
Fork 0
mirror of https://github.com/rhboot/gnu-efi synced 2026-08-26 00:26:04 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Semi-asciibetize _Print()'s formatters.

Browse source 
This is ascii order but with upper and lower case letters mixed, so
things like 'X' and 'x' that use fallthrough still stay together.

Signed-off-by: Peter Jones <pjones@redhat.com>
This commit is contained in:
Peter Jones 2019-11-18 13:05:15 -05:00 • committed by Nigel Croxon
parent 368cdf1265
commit f7bf4302e4
1 changed files with 72 additions and 74 deletions
Download patch file Download diff file Expand all files Collapse all files

146
lib/print.c
View file

@ -1125,24 +1125,24 @@ Returns:
Item.Item.pw = Item.Scratch;
break;
case '0':
Item.Pad = '0';
case ',':
Item.Comma = TRUE;
break;
case '-':
Item.PadBefore = FALSE;
break;
case ',':
Item.Comma = TRUE;
case '*':
*Item.WidthParse = va_arg(ps->args, UINTN);
break;
case '.':
Item.WidthParse = &Item.FieldWidth;
break;
case '*':
*Item.WidthParse = va_arg(ps->args, UINTN);
case '0':
Item.Pad = '0';
break;
case '1':
@ -1170,62 +1170,12 @@ Returns:
}
break;
case 's':
Item.Item.pw = va_arg(ps->args, CHAR16 *);
if (!Item.Item.pw) {
Item.Item.pw = L"(null)";
}
break;
case 'c':
Item.Scratch[0] = (CHAR16) va_arg(ps->args, UINTN);
Item.Scratch[1] = 0;
Item.Item.pw = Item.Scratch;
break;
case 'l':
Item.Long = TRUE;
break;
case 'X':
Item.Width = Item.Long ? 16 : 8;
Item.Pad = '0';
#if __GNUC__ >= 7
__attribute__ ((fallthrough));
#endif
case 'x':
ValueToHex (
Item.Scratch,
Item.Long ? va_arg(ps->args, UINT64) : va_arg(ps->args, UINT32)
);
Item.Item.pw = Item.Scratch;
break;
case 'g':
GuidToString (Item.Scratch, va_arg(ps->args, EFI_GUID *));
Item.Item.pw = Item.Scratch;
break;
case 'u':
ValueToString (
Item.Scratch,
Item.Comma,
Item.Long ? va_arg(ps->args, UINT64) : va_arg(ps->args, UINT32)
);
Item.Item.pw = Item.Scratch;
break;
case 'd':
ValueToString (
Item.Scratch,
Item.Comma,
Item.Long ? va_arg(ps->args, INT64) : va_arg(ps->args, INT32)
);
Item.Item.pw = Item.Scratch;
break;
case 'D':
{
EFI_DEVICE_PATH *dp = va_arg(ps->args, EFI_DEVICE_PATH *);
@ -1238,6 +1188,23 @@ Returns:
break;
}
case 'd':
ValueToString (
Item.Scratch,
Item.Comma,
Item.Long ? va_arg(ps->args, INT64) : va_arg(ps->args, INT32)
);
Item.Item.pw = Item.Scratch;
break;
case 'E':
Attr = ps->AttrError;
break;
case 'e':
PSETATTR(ps, ps->AttrError);
break;
case 'f':
FloatToString (
Item.Scratch,
@ -1247,38 +1214,69 @@ Returns:
Item.Item.pw = Item.Scratch;
break;
case 't':
TimeToString (Item.Scratch, va_arg(ps->args, EFI_TIME *));
case 'g':
GuidToString (Item.Scratch, va_arg(ps->args, EFI_GUID *));
Item.Item.pw = Item.Scratch;
break;
case 'H':
Attr = ps->AttrHighlight;
break;
case 'h':
PSETATTR(ps, ps->AttrHighlight);
break;
case 'l':
Item.Long = TRUE;
break;
case 'N':
Attr = ps->AttrNorm;
break;
case 'n':
PSETATTR(ps, ps->AttrNorm);
break;
case 'r':
StatusToString (Item.Scratch, va_arg(ps->args, EFI_STATUS));
Item.Item.pw = Item.Scratch;
break;
case 'n':
PSETATTR(ps, ps->AttrNorm);
case 's':
Item.Item.pw = va_arg(ps->args, CHAR16 *);
if (!Item.Item.pw) {
Item.Item.pw = L"(null)";
}
break;
case 'h':
PSETATTR(ps, ps->AttrHighlight);
case 't':
TimeToString (Item.Scratch, va_arg(ps->args, EFI_TIME *));
Item.Item.pw = Item.Scratch;
break;
case 'e':
PSETATTR(ps, ps->AttrError);
case 'u':
ValueToString (
Item.Scratch,
Item.Comma,
Item.Long ? va_arg(ps->args, UINT64) : va_arg(ps->args, UINT32)
);
Item.Item.pw = Item.Scratch;
break;
case 'N':
Attr = ps->AttrNorm;
break;
case 'H':
Attr = ps->AttrHighlight;
break;
case 'E':
Attr = ps->AttrError;
case 'X':
Item.Width = Item.Long ? 16 : 8;
Item.Pad = '0';
#if __GNUC__ >= 7
__attribute__ ((fallthrough));
#endif
case 'x':
ValueToHex (
Item.Scratch,
Item.Long ? va_arg(ps->args, UINT64) : va_arg(ps->args, UINT32)
);
Item.Item.pw = Item.Scratch;
break;
default: