diff options
| author | Martin v. Löwis <martin@v.loewis.de> | 2001-07-24 06:33:08 (GMT) |
|---|---|---|
| committer | Martin v. Löwis <martin@v.loewis.de> | 2001-07-24 06:33:08 (GMT) |
| commit | 791bfda2b364ec91e5affab2fc0a60ac1701f392 (patch) | |
| tree | 686873e043a38e6326b17d07d7f641d31df4fd99 /Modules | |
| parent | c547b46c067656b39c564a84a2979ec985e7b869 (diff) | |
| download | cpython-791bfda2b364ec91e5affab2fc0a60ac1701f392.zip cpython-791bfda2b364ec91e5affab2fc0a60ac1701f392.tar.gz cpython-791bfda2b364ec91e5affab2fc0a60ac1701f392.tar.bz2 | |
Autocheck for snprintf, and use sprintf if it is not available.
Remove declaration of h_errno, since it is supposedly declared in netdb.h.
Changes proposed by itojun.
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/getaddrinfo.c | 4 | ||||
| -rw-r--r-- | Modules/socketmodule.c | 11 |
2 files changed, 8 insertions, 7 deletions
diff --git a/Modules/getaddrinfo.c b/Modules/getaddrinfo.c index 7d07e53..67e6ce1 100644 --- a/Modules/getaddrinfo.c +++ b/Modules/getaddrinfo.c @@ -544,10 +544,6 @@ get_addr(hostname, af, res, pai, port0) struct gai_afd *gai_afd; int i, error = 0, h_error; char *ap; -#if !defined(INET6) && !defined(h_errno) - /* In winsock.h, h_errno is #defined as a function call. */ - extern int h_errno; -#endif top = NULL; sentinel.ai_next = NULL; diff --git a/Modules/socketmodule.c b/Modules/socketmodule.c index 1c19c28..863a407 100644 --- a/Modules/socketmodule.c +++ b/Modules/socketmodule.c @@ -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); |