diff options
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/_fileio.c | 8 | ||||
| -rw-r--r-- | Modules/main.c | 6 | ||||
| -rw-r--r-- | Modules/posixmodule.c | 4 | ||||
| -rw-r--r-- | Modules/socketmodule.c | 7 |
4 files changed, 2 insertions, 23 deletions
diff --git a/Modules/_fileio.c b/Modules/_fileio.c index 7490ed6..9868e56 100644 --- a/Modules/_fileio.c +++ b/Modules/_fileio.c @@ -104,11 +104,7 @@ dircheck(PyFileIOObject* self) if (self->fd < 0) return 0; if (fstat(self->fd, &buf) == 0 && S_ISDIR(buf.st_mode)) { -#ifdef HAVE_STRERROR char *msg = strerror(EISDIR); -#else - char *msg = "Is a directory"; -#endif PyObject *exc; internal_close(self); @@ -295,12 +291,8 @@ fileio_dealloc(PyFileIOObject *self) if (self->fd >= 0 && self->closefd) { errno = internal_close(self); if (errno < 0) { -#ifdef HAVE_STRERROR PySys_WriteStderr("close failed: [Errno %d] %s\n", errno, strerror(errno)); -#else - PySys_WriteStderr("close failed: [Errno %d]\n", errno); -#endif } } diff --git a/Modules/main.c b/Modules/main.c index ce05431..9f0b01c 100644 --- a/Modules/main.c +++ b/Modules/main.c @@ -507,13 +507,9 @@ Py_Main(int argc, char **argv) if (sts==-1 && filename!=NULL) { if ((fp = fopen(filename, "r")) == NULL) { -#ifdef HAVE_STRERROR fprintf(stderr, "%s: can't open file '%s': [Errno %d] %s\n", argv[0], filename, errno, strerror(errno)); -#else - fprintf(stderr, "%s: can't open file '%s': Errno %d\n", - argv[0], filename, errno); -#endif + return 2; } else if (skipfirstline) { diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c index 118e67b..3e91f00 100644 --- a/Modules/posixmodule.c +++ b/Modules/posixmodule.c @@ -5239,7 +5239,6 @@ posix_unsetenv(PyObject *self, PyObject *args) } #endif /* unsetenv */ -#ifdef HAVE_STRERROR PyDoc_STRVAR(posix_strerror__doc__, "strerror(code) -> string\n\n\ Translate an error code to a message string."); @@ -5259,7 +5258,6 @@ posix_strerror(PyObject *self, PyObject *args) } return PyUnicode_FromString(message); } -#endif /* strerror */ #ifdef HAVE_SYS_WAIT_H @@ -6977,9 +6975,7 @@ static PyMethodDef posix_methods[] = { #ifdef HAVE_UNSETENV {"unsetenv", posix_unsetenv, METH_VARARGS, posix_unsetenv__doc__}, #endif -#ifdef HAVE_STRERROR {"strerror", posix_strerror, METH_VARARGS, posix_strerror__doc__}, -#endif #ifdef HAVE_FCHDIR {"fchdir", posix_fchdir, METH_O, posix_fchdir__doc__}, #endif diff --git a/Modules/socketmodule.c b/Modules/socketmodule.c index aed8bb8..e2f384b 100644 --- a/Modules/socketmodule.c +++ b/Modules/socketmodule.c @@ -2922,15 +2922,10 @@ gethost_common(struct hostent *h, struct sockaddr *addr, int alen, int af) } if (h->h_addrtype != af) { -#ifdef HAVE_STRERROR /* Let's get real error message to return */ PyErr_SetString(socket_error, (char *)strerror(EAFNOSUPPORT)); -#else - PyErr_SetString( - socket_error, - "Address family not supported by protocol family"); -#endif + return NULL; } |