mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-15 05:06:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 12

Finished removing _PyOS_double_to_string, as mentioned in issue 7117.

Browse source
This commit is contained in:
Eric Smith 2009-10-26 17:46:17 +00:00
parent 975d7576ca
commit c1bdf89145
5 changed files with 32 additions and 159 deletions
Download patch file Download diff file Expand all files Collapse all files

20
Objects/stringobject.c
View file

@ -4336,7 +4336,10 @@ Py_LOCAL_INLINE(int)
formatfloat(char *buf, size_t buflen, int flags,
int prec, int type, PyObject *v)
{
char *tmp;
double x;
Py_ssize_t len;
x = PyFloat_AsDouble(v);
if (x == -1.0 && PyErr_Occurred()) {
PyErr_Format(PyExc_TypeError, "float argument required, "
@ -4381,9 +4384,20 @@ formatfloat(char *buf, size_t buflen, int flags,
"formatted float is too long (precision too large?)");
return -1;
}
_PyOS_double_to_string(buf, buflen, x, type, prec,
(flags&F_ALT)?Py_DTSF_ALT:0, NULL);
return (int)strlen(buf);
tmp = PyOS_double_to_string(x, type, prec,
(flags&F_ALT)?Py_DTSF_ALT:0, NULL);
if (!tmp)
return -1;
len = strlen(tmp);
if (len >= buflen) {
PyErr_SetString(PyExc_OverflowError,
"formatted float is too long (precision too large?)");
PyMem_Free(tmp);
return -1;
}
strcpy(buf, tmp);
PyMem_Free(tmp);
return (int)len;
}
/* _PyString_FormatLong emulates the format codes d, u, o, x and X, and