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

SDL_vsnprintf: implemented '+' flag for signed integers printing. 

it is, of course, ignored for %u, %x, %o and %p.
This commit is contained in:
Ozkan Sezer 2018-09-29 01:24:10 +03:00
parent 49803c8660
commit 31596f23ce
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/stdlib/SDL_string.c
View File

@ -1361,7 +1361,7 @@ typedef enum
typedef struct typedef struct
{ {
SDL_bool left_justify; /* for now: ignored. */ SDL_bool left_justify; /* for now: ignored. */
SDL_bool force_sign; /* for now: used only by float printer, ignored otherwise. */ SDL_bool force_sign;
SDL_bool force_type; /* for now: used only by float printer, ignored otherwise. */ SDL_bool force_type; /* for now: used only by float printer, ignored otherwise. */
SDL_bool pad_zeroes; SDL_bool pad_zeroes;
SDL_letter_case force_case; SDL_letter_case force_case;
@ -1453,9 +1453,13 @@ SDL_IntPrecisionAdjust(char *num, size_t maxlen, SDL_FormatInfo *info)
static size_t static size_t
SDL_PrintLong(char *text, size_t maxlen, SDL_FormatInfo *info, long value) SDL_PrintLong(char *text, size_t maxlen, SDL_FormatInfo *info, long value)
{ {
char num[130]; char num[130], *p = num;
SDL_ltoa(value, num, info ? info->radix : 10); if (info->force_sign && value >= 0L) {
*p++ = '+';
}
SDL_ltoa(value, p, info ? info->radix : 10);
SDL_IntPrecisionAdjust(num, maxlen, info); SDL_IntPrecisionAdjust(num, maxlen, info);
return SDL_PrintString(text, maxlen, info, num); return SDL_PrintString(text, maxlen, info, num);
} }
@ -1473,9 +1477,13 @@ SDL_PrintUnsignedLong(char *text, size_t maxlen, SDL_FormatInfo *info, unsigned
static size_t static size_t
SDL_PrintLongLong(char *text, size_t maxlen, SDL_FormatInfo *info, Sint64 value) SDL_PrintLongLong(char *text, size_t maxlen, SDL_FormatInfo *info, Sint64 value)
{ {
char num[130]; char num[130], *p = num;
SDL_lltoa(value, num, info ? info->radix : 10); if (info->force_sign && value >= (Sint64)0) {
*p++ = '+';
}
SDL_lltoa(value, p, info ? info->radix : 10);
SDL_IntPrecisionAdjust(num, maxlen, info); SDL_IntPrecisionAdjust(num, maxlen, info);
return SDL_PrintString(text, maxlen, info, num); return SDL_PrintString(text, maxlen, info, num);
} }
@ -1737,6 +1745,7 @@ 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.force_sign = SDL_FALSE;
if (info.precision >= 0) { if (info.precision >= 0) {
info.pad_zeroes = SDL_FALSE; info.pad_zeroes = SDL_FALSE;
} }