Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Three micro fixes to formatstring

This commit is contained in:
Guido van Rossum 1993-11-11 14:51:57 +00:00
parent b31c7f732a
commit 6938a297da
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Objects/stringobject.c
View File

@ -643,7 +643,7 @@ formatstring(format, args)
int width = -1;
int prec = -1;
int size = 0;
int c;
int c = '\0';
int fill;
object *v;
char *buf;
@ -788,15 +788,13 @@ formatstring(format, args)
buf = formatchar(v);
if (buf == NULL)
goto error;
len = strlen(buf);
len = 1;
break;
default:
err_setstr(ValueError,
"unsupported format character");
goto error;
}
/* XXX There's a bug somewhere here so that
XXX '%4d'%-1 yields '- 1' ... */
if (sign) {
if (*buf == '-' || *buf == '+') {
sign = *buf++;
@ -820,7 +818,6 @@ formatstring(format, args)
res = getstringvalue(result) + reslen - rescnt;
}
if (sign) {
*res++ = sign;
rescnt--;
if (width > len)
width--;
@ -831,6 +828,8 @@ formatstring(format, args)
*res++ = fill;
} while (--width > len);
}
if (sign)
*res++ = sign;
memcpy(res, buf, len);
res += len;
rescnt -= len;