From 7d0e528a19a37cb336a80601fb95228921bb457c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=91=D1=80=D0=B0=D0=BD=D0=B8=D0=BC=D0=B8=D1=80=20=D0=9A?= =?UTF-8?q?=D0=B0=D1=80=D0=B0=D1=9F=D0=B8=D1=9B?= Date: Sun, 3 Oct 2021 19:07:12 -0700 Subject: [PATCH] Cleanup. --- src/string.cpp | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/src/string.cpp b/src/string.cpp index fb5afed..d477bbe 100644 --- a/src/string.cpp +++ b/src/string.cpp @@ -1089,21 +1089,18 @@ namespace bx // Reference(s): // - Type field // https://en.wikipedia.org/wiki/Printf_format_string#Type_field - switch (toLower(ch) ) + switch (ch) { case 'c': size += write(_writer, char(va_arg(_argList, int32_t) ), param, _err); break; case 's': - if (isUpper(ch) ) - { - size += write(_writer, va_arg(_argList, const StringView), param, _err); - } - else - { - size += write(_writer, va_arg(_argList, const char*), param, _err); - } + size += write(_writer, va_arg(_argList, const char*), param, _err); + break; + + case 'S': + size += write(_writer, va_arg(_argList, const StringView), param, _err); break; case 'o': @@ -1126,8 +1123,11 @@ namespace bx break; case 'e': + case 'E': case 'f': + case 'F': case 'g': + case 'G': param.upper = isUpper(ch); size += write(_writer, va_arg(_argList, double), param, _err); break; @@ -1137,6 +1137,7 @@ namespace bx break; case 'x': + case 'X': param.base = 16; param.upper = isUpper(ch); switch (param.bits)