|
@@ -1089,21 +1089,18 @@ namespace bx
|
|
|
// Reference(s):
|
|
// Reference(s):
|
|
|
// - Type field
|
|
// - Type field
|
|
|
// https://en.wikipedia.org/wiki/Printf_format_string#Type_field
|
|
// https://en.wikipedia.org/wiki/Printf_format_string#Type_field
|
|
|
- switch (toLower(ch) )
|
|
|
|
|
|
|
+ switch (ch)
|
|
|
{
|
|
{
|
|
|
case 'c':
|
|
case 'c':
|
|
|
size += write(_writer, char(va_arg(_argList, int32_t) ), param, _err);
|
|
size += write(_writer, char(va_arg(_argList, int32_t) ), param, _err);
|
|
|
break;
|
|
break;
|
|
|
|
|
|
|
|
case 's':
|
|
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;
|
|
break;
|
|
|
|
|
|
|
|
case 'o':
|
|
case 'o':
|
|
@@ -1126,8 +1123,11 @@ namespace bx
|
|
|
break;
|
|
break;
|
|
|
|
|
|
|
|
case 'e':
|
|
case 'e':
|
|
|
|
|
+ case 'E':
|
|
|
case 'f':
|
|
case 'f':
|
|
|
|
|
+ case 'F':
|
|
|
case 'g':
|
|
case 'g':
|
|
|
|
|
+ case 'G':
|
|
|
param.upper = isUpper(ch);
|
|
param.upper = isUpper(ch);
|
|
|
size += write(_writer, va_arg(_argList, double), param, _err);
|
|
size += write(_writer, va_arg(_argList, double), param, _err);
|
|
|
break;
|
|
break;
|
|
@@ -1137,6 +1137,7 @@ namespace bx
|
|
|
break;
|
|
break;
|
|
|
|
|
|
|
|
case 'x':
|
|
case 'x':
|
|
|
|
|
+ case 'X':
|
|
|
param.base = 16;
|
|
param.base = 16;
|
|
|
param.upper = isUpper(ch);
|
|
param.upper = isUpper(ch);
|
|
|
switch (param.bits)
|
|
switch (param.bits)
|