Mercurial > cpython-lru_cache-weakref
diff Modules/socketmodule.c @ 10454:dad14ffe1c22 legacy-trunk
Implement two suggestions by Jonathan Giddy: (1) in AIX, clear the
data struct before calling gethostby{name,addr}_r(); (2) ignore the
3/5/6 args determinations made by the configure script and switch on
platform identifiers instead:
AIX, OSF have 3 args
Sun, SGI have 5 args
Linux has 6 args
On all other platforms, undef HAVE_GETHOSTBYNAME_R altogether.
| author | Guido van Rossum <guido@python.org> |
|---|---|
| date | Wed, 24 Mar 1999 17:24:33 +0000 |
| parents | 5b54fa775e55 |
| children | 3be0525bf47f |
line wrap: on
line diff
--- a/Modules/socketmodule.c Wed Mar 24 17:20:40 1999 +0000 +++ b/Modules/socketmodule.c Wed Mar 24 17:24:33 1999 +0000 @@ -87,6 +87,22 @@ #include "Python.h" +#undef HAVE_GETHOSTBYNAME_R_3_ARG +#undef HAVE_GETHOSTBYNAME_R_5_ARG +#undef HAVE_GETHOSTBYNAME_R_6_ARG + +#ifdef HAVE_GETHOSTBYNAME_R +#if defined(_AIX) || defined(__osf__) +#define HAVE_GETHOSTBYNAME_R_3_ARG +#elif defined(__sun__) || defined(__sgi) +#define HAVE_GETHOSTBYNAME_R_5_ARG +#elif defined(linux) +#define HAVE_GETHOSTBYNAME_R_6_ARG +#else +#undef HAVE_GETHOSTBYNAME_R +#endif +#endif + #if !defined(HAVE_GETHOSTBYNAME_R) && defined(WITH_THREAD) && !defined(MS_WINDOWS) #define USE_GETHOSTBYNAME_LOCK #endif @@ -373,6 +389,7 @@ #elif defined(HAVE_GETHOSTBYNAME_R_5_ARG) hp = gethostbyname_r(name, &hp_allocated, buf, buf_len, &errnop); #else /* HAVE_GETHOSTBYNAME_R_3_ARG */ + memset((void *) &data, '\0', sizeof(data)); result = gethostbyname_r(name, &hp_allocated, &data); hp = (result != 0) ? NULL : &hp_allocated; #endif @@ -1451,6 +1468,7 @@ #elif defined(HAVE_GETHOSTBYNAME_R_5_ARG) h = gethostbyname_r(name, &hp_allocated, buf, buf_len, &errnop); #else /* HAVE_GETHOSTBYNAME_R_3_ARG */ + memset((void *) &data, '\0', sizeof(data)); result = gethostbyname_r(name, &hp_allocated, &data); h = (result != 0) ? NULL : &hp_allocated; #endif @@ -1516,6 +1534,7 @@ AF_INET, &hp_allocated, buf, buf_len, &errnop); #else /* HAVE_GETHOSTBYNAME_R_3_ARG */ + memset((void *) &data, '\0', sizeof(data)); result = gethostbyaddr_r((char *)&addr.sin_addr, sizeof(addr.sin_addr), AF_INET, &hp_allocated, &data);