encounter
/
SDL
mirror of https://github.com/encounter/SDL.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SDL_vsnprintf() updates for zero-padding: 

- remove force-enabling of pad_zeroes for %u for compatibility
 (was added in https://hg.libsdl.org/SDL/rev/701f4a25df89)
- ignore pad_zeroes for %s and %S
- ignore pad_zeroes for %d, %i and %u if a precision is given
This commit is contained in:
Ozkan Sezer 2018-09-27 09:37:36 +03:00
parent 7689162ca0
commit bb5516ac8e
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/stdlib/SDL_string.c
View File

@ -1415,7 +1415,7 @@ SDL_PrintString(char *text, size_t maxlen, SDL_FormatInfo *info, const char *str
static void static void
SDL_IntPrecisionAdjust(char *num, size_t maxlen, SDL_FormatInfo *info) SDL_IntPrecisionAdjust(char *num, size_t maxlen, SDL_FormatInfo *info)
{/* left-pad num with zeroes, if needed. */ {/* left-pad num with zeroes. */
size_t sz, pad; size_t sz, pad;
if (!info || info->precision < 0) if (!info || info->precision < 0)
@ -1681,6 +1681,9 @@ SDL_vsnprintf(SDL_OUT_Z_CAP(maxlen) char *text, size_t maxlen, const char *fmt,
break; break;
case 'i': case 'i':
case 'd': case 'd':
if (info.precision >= 0) {
info.pad_zeroes = SDL_FALSE;
}
switch (inttype) { switch (inttype) {
case DO_INT: case DO_INT:
len = SDL_PrintLong(text, left, &info, len = SDL_PrintLong(text, left, &info,
@ -1718,7 +1721,9 @@ SDL_vsnprintf(SDL_OUT_Z_CAP(maxlen) char *text, size_t maxlen, const char *fmt,
} }
/* Fall through to unsigned handling */ /* Fall through to unsigned handling */
case 'u': case 'u':
info.pad_zeroes = SDL_TRUE; if (info.precision >= 0) {
info.pad_zeroes = SDL_FALSE;
}
switch (inttype) { switch (inttype) {
case DO_INT: case DO_INT:
len = SDL_PrintUnsignedLong(text, left, &info, len = SDL_PrintUnsignedLong(text, left, &info,
@ -1745,12 +1750,14 @@ SDL_vsnprintf(SDL_OUT_Z_CAP(maxlen) char *text, size_t maxlen, const char *fmt,
/* In practice this is used on Windows for WCHAR strings */ /* In practice this is used on Windows for WCHAR strings */
wchar_t *wide_arg = va_arg(ap, wchar_t *); wchar_t *wide_arg = va_arg(ap, wchar_t *);
char *arg = SDL_iconv_string("UTF-8", "UTF-16LE", (char *)(wide_arg), (SDL_wcslen(wide_arg)+1)*sizeof(*wide_arg)); char *arg = SDL_iconv_string("UTF-8", "UTF-16LE", (char *)(wide_arg), (SDL_wcslen(wide_arg)+1)*sizeof(*wide_arg));
info.pad_zeroes = SDL_FALSE;
len = SDL_PrintString(text, left, &info, arg); len = SDL_PrintString(text, left, &info, arg);
SDL_free(arg); SDL_free(arg);
done = SDL_TRUE; done = SDL_TRUE;
} }
break; break;
case 's': case 's':
info.pad_zeroes = SDL_FALSE;
len = SDL_PrintString(text, left, &info, va_arg(ap, char *)); len = SDL_PrintString(text, left, &info, va_arg(ap, char *));
done = SDL_TRUE; done = SDL_TRUE;
break; break;