From a2e48552d28721eec0df75912d479f7d44c14d0a Mon Sep 17 00:00:00 2001 From: Guido van Rossum Date: Thu, 9 Sep 1999 15:42:59 +0000 Subject: [PATCH] It appears that inet_aton() doesn't really exist except in libresolv; the proper function to call is inet_addr(). Since we already had code to do that (for MS-Windows), this simplifies things a lot! --- Modules/socketmodule.c | 23 +++-------------------- 1 file changed, 3 insertions(+), 20 deletions(-) diff --git a/Modules/socketmodule.c b/Modules/socketmodule.c index e64090e208b..93a3b099649 100644 --- a/Modules/socketmodule.c +++ b/Modules/socketmodule.c @@ -1807,26 +1807,10 @@ binary format used in low-level network functions."; static PyObject* BUILD_FUNC_DEF_2(PySocket_inet_aton, PyObject *, self, PyObject *, args) { -#ifndef MS_WINDOWS - char *ip_addr; - struct in_addr packed_addr; - int err; +#ifndef INADDR_NONE +#define INADDR_NONE (-1) +#endif - if (!PyArg_Parse(args, "s", &ip_addr)) { - return NULL; - } - - err = inet_aton(ip_addr, &packed_addr); - - if (err == 0) { /* invalid address */ - PyErr_SetString(PySocket_Error, - "illegal IP address string passed to inet_aton"); - return NULL; - } - - return PyString_FromStringAndSize((char *) &packed_addr, - sizeof(packed_addr)); -#else /* MS_WINDOWS */ /* Have to use inet_addr() instead */ char *ip_addr; long packed_addr; @@ -1845,7 +1829,6 @@ BUILD_FUNC_DEF_2(PySocket_inet_aton, PyObject *, self, PyObject *, args) return PyString_FromStringAndSize((char *) &packed_addr, sizeof(packed_addr)); -#endif /* MS_WINDOWS */ } static char inet_ntoa_doc[] =