mirror of https://github.com/python/cpython
Enable PyOS_snprintf() et al. during alpha phase of 2.2.0 and
add another use case to the socketmodule.
This commit is contained in:
parent
77707673f4
commit
03d1b1814b
|
@ -115,6 +115,13 @@ extern DL_IMPORT(PyObject *) PyErr_ProgramText(char *, int);
|
|||
# define snprintf _snprintf
|
||||
# define vsnprintf _vsnprintf
|
||||
#endif
|
||||
|
||||
/* Always enable the fallback solution during the 2.2.0 alpha cycle
|
||||
for enhanced testing */
|
||||
#if PY_VERSION_HEX < 0x020200B0
|
||||
# undef HAVE_SNPRINTF
|
||||
#endif
|
||||
|
||||
#ifndef HAVE_SNPRINTF
|
||||
#include <stdarg.h>
|
||||
extern DL_IMPORT(int) PyOS_snprintf(char *str, size_t size, const char *format, ...);
|
||||
|
|
|
@ -2349,11 +2349,7 @@ PySocket_getaddrinfo(PyObject *self, PyObject *args)
|
|||
return NULL;
|
||||
}
|
||||
if (PyInt_Check(pobj)) {
|
||||
#ifndef HAVE_SNPRINTF
|
||||
sprintf(pbuf, "%ld", PyInt_AsLong(pobj));
|
||||
#else
|
||||
snprintf(pbuf, sizeof(pbuf), "%ld", PyInt_AsLong(pobj));
|
||||
#endif
|
||||
PyOS_snprintf(pbuf, sizeof(pbuf), "%ld", PyInt_AsLong(pobj));
|
||||
pptr = pbuf;
|
||||
} else if (PyString_Check(pobj)) {
|
||||
pptr = PyString_AsString(pobj);
|
||||
|
@ -2424,11 +2420,7 @@ PySocket_getnameinfo(PyObject *self, PyObject *args)
|
|||
n = PyArg_ParseTuple(sa, "si|ii", &hostp, &port, &flowinfo, scope_id);
|
||||
if (n == 0)
|
||||
goto fail;
|
||||
#ifdef HAVE_SNPRINTF
|
||||
snprintf(pbuf, sizeof(pbuf), "%d", port);
|
||||
#else
|
||||
sprintf(pbuf, "%d", port);
|
||||
#endif
|
||||
PyOS_snprintf(pbuf, sizeof(pbuf), "%d", port);
|
||||
memset(&hints, 0, sizeof(hints));
|
||||
hints.ai_family = PF_UNSPEC;
|
||||
error = getaddrinfo(hostp, pbuf, &hints, &res);
|
||||
|
|
Loading…
Reference in New Issue