mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-31 14:07:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Autocheck for snprintf, and use sprintf if it is not available.

Browse source 
Remove declaration of h_errno, since it is supposedly declared in netdb.h.
Changes proposed by itojun.
This commit is contained in:
Martin v. Löwis 2001-07-24 06:33:08 +00:00
parent c547b46c06
commit 791bfda2b3
5 changed files with 14 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

11
Modules/socketmodule.c
View file

@ -1789,9 +1789,6 @@ gethost_common(struct hostent *h, struct sockaddr *addr, int alen, int af)
if (h == NULL) {
/* Let's get real error message to return */
#ifndef h_errno
extern int h_errno;
#endif
PyH_Err(h_errno);
return NULL;
}
@ -2348,7 +2345,11 @@ 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
pptr = pbuf;
} else if (PyString_Check(pobj)) {
pptr = PyString_AsString(pobj);
@ -2419,7 +2420,11 @@ PySocket_getnameinfo(PyObject *self, PyObject *args)
n = PyArg_ParseTuple(sa, "si|ii", &hostp, &port, &flowinfo, scope_id);
if (n == 0)
goto fail;
#ifdef HAVE_SPRINTF
snprintf(pbuf, sizeof(pbuf), "%d", port);
#else
sprintf(pbuf, "%d", port);
#endif
memset(&hints, 0, sizeof(hints));
hints.ai_family = PF_UNSPEC;
error = getaddrinfo(hostp, pbuf, &hints, &res);