mirror of
https://github.com/Fishwaldo/opensbi.git
synced 2025-03-15 19:31:32 +00:00
lib: sbi: Fix how print gets flags
The flags for print should be able to appear in any order. The previous code required the order to be fixed. Signed-off-by: Xiang W <wxjstz@126.com> Reviewed-by: Anup Patel <anup@brainfault.org>
This commit is contained in:
parent
976895c57e
commit
6053917626
1 changed files with 19 additions and 11 deletions
|
@ -236,6 +236,7 @@ static int printi(char **out, u32 *out_len, long long i, int b, int sg,
|
|||
|
||||
static int print(char **out, u32 *out_len, const char *format, va_list args)
|
||||
{
|
||||
bool flags_done;
|
||||
int width, flags, pc = 0;
|
||||
char scr[2], *tout;
|
||||
bool use_tbuf = (!out) ? true : false;
|
||||
|
@ -268,17 +269,24 @@ static int print(char **out, u32 *out_len, const char *format, va_list args)
|
|||
if (*format == '%')
|
||||
goto literal;
|
||||
/* Get flags */
|
||||
if (*format == '-') {
|
||||
++format;
|
||||
flags = PAD_RIGHT;
|
||||
}
|
||||
if (*format == '#') {
|
||||
++format;
|
||||
flags |= PAD_ALTERNATE;
|
||||
}
|
||||
while (*format == '0') {
|
||||
++format;
|
||||
flags |= PAD_ZERO;
|
||||
flags_done = false;
|
||||
while (!flags_done) {
|
||||
switch (*format) {
|
||||
case '-':
|
||||
flags |= PAD_RIGHT;
|
||||
break;
|
||||
case '#':
|
||||
flags |= PAD_ALTERNATE;
|
||||
break;
|
||||
case '0':
|
||||
flags |= PAD_ZERO;
|
||||
break;
|
||||
default:
|
||||
flags_done = true;
|
||||
break;
|
||||
}
|
||||
if (!flags_done)
|
||||
++format;
|
||||
}
|
||||
/* Get width */
|
||||
for (; *format >= '0' && *format <= '9'; ++format) {
|
||||
|
|
Loading…
Add table
Reference in a new issue