uGFX
/
ugfx
2
0
Fork 0
Code Issues 2 Pull Requests Projects Releases Wiki Activity

GFILE bug fix

remotes/origin_old/ugfx_release_2.6
Joel Bodenmann 2014-05-11 16:26:41 +02:00
parent 32f1ec9b12
commit 6961a536e5
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/gfile/gfile.c
View File

@ -595,7 +595,7 @@ bool_t gfileEOF(GFILE *f) {
if (c >= '0' && c <= '9') if (c >= '0' && c <= '9')
c -= '0'; c -= '0';
else if (c == '*') else if (c == '*')
c = va_arg(ap, int); c = va_arg(arg, int);
else else
break; break;
width = width * 10 + c; width = width * 10 + c;
@ -606,7 +606,7 @@ bool_t gfileEOF(GFILE *f) {
if (c >= '0' && c <= '9') if (c >= '0' && c <= '9')
c -= '0'; c -= '0';
else if (c == '*') else if (c == '*')
c = va_arg(ap, int); c = va_arg(arg, int);
else else
break; break;
precision = precision * 10 + c; precision = precision * 10 + c;
@ -627,11 +627,11 @@ bool_t gfileEOF(GFILE *f) {
return ret; return ret;
case 'c': case 'c':
filler = ' '; filler = ' ';
*p++ = va_arg(ap, int); *p++ = va_arg(arg, int);
break; break;
case 's': case 's':
filler = ' '; filler = ' ';
if ((s = va_arg(ap, char *)) == 0) if ((s = va_arg(arg, char *)) == 0)
s = "(null)"; s = "(null)";
if (precision == 0) if (precision == 0)
precision = 32767; precision = 32767;
@ -640,9 +640,9 @@ bool_t gfileEOF(GFILE *f) {
case 'D': case 'D':
case 'd': case 'd':
if (is_long) if (is_long)
l = va_arg(ap, long); l = va_arg(arg, long);
else else
l = va_arg(ap, int); l = va_arg(arg, int);
if (l < 0) { if (l < 0) {
*p++ = '-'; *p++ = '-';
l = -l; l = -l;
@ -651,7 +651,7 @@ bool_t gfileEOF(GFILE *f) {
break; break;
#if GFILE_ALLOW_FLOATS #if GFILE_ALLOW_FLOATS
case 'f': case 'f':
f = (float) va_arg(ap, double); f = (float) va_arg(arg, double);
if (f < 0) { if (f < 0) {
*p++ = '-'; *p++ = '-';
f = -f; f = -f;
@ -676,9 +676,9 @@ bool_t gfileEOF(GFILE *f) {
c = 8; c = 8;
unsigned_common: unsigned_common:
if (is_long) if (is_long)
l = va_arg(ap, long); l = va_arg(arg, long);
else else
l = va_arg(ap, int); l = va_arg(arg, int);
p = ltoa_wd(p, l, c, 0); p = ltoa_wd(p, l, c, 0);
break; break;
default: default: