diff options
| author | Brett Cannon <bcannon@gmail.com> | 2008-03-18 15:35:58 (GMT) |
|---|---|---|
| committer | Brett Cannon <bcannon@gmail.com> | 2008-03-18 15:35:58 (GMT) |
| commit | 10ed0f50a989f83395b7af67249d44d2419e5d3f (patch) | |
| tree | 40223244ca701e2eb978455d710ba6c6f585fa65 /Modules | |
| parent | 50a24d8bfdb831f6cb79ad717af6e5c17230763f (diff) | |
| download | cpython-10ed0f50a989f83395b7af67249d44d2419e5d3f.zip cpython-10ed0f50a989f83395b7af67249d44d2419e5d3f.tar.gz cpython-10ed0f50a989f83395b7af67249d44d2419e5d3f.tar.bz2 | |
Remove all traces of HAVE_STRERROR.
The removal of strerror.c led to the function check being removed from
configure.in.
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 bf52707..00689b3 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 e6409e8..0cd879d 100644 --- a/Modules/main.c +++ b/Modules/main.c @@ -539,13 +539,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 fab44d6..f73b73e 100644 --- a/Modules/posixmodule.c +++ b/Modules/posixmodule.c @@ -6710,7 +6710,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."); @@ -6730,7 +6729,6 @@ posix_strerror(PyObject *self, PyObject *args) } return PyString_FromString(message); } -#endif /* strerror */ #ifdef HAVE_SYS_WAIT_H @@ -8510,9 +8508,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 d5114e8..13354d0 100644 --- a/Modules/socketmodule.c +++ b/Modules/socketmodule.c @@ -3110,15 +3110,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; } |