mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-07-30 06:34:15 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Remove all traces of HAVE_STRERROR.

Browse source 
The removal of strerror.c led to the function check being removed from
configure.in.
This commit is contained in:
Brett Cannon 2008-03-18 15:35:58 +00:00
parent 50a24d8bfd
commit 10ed0f50a9
5 changed files with 2 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Modules/_fileio.c
View file

@ -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
}
}

6
Modules/main.c
View file

@ -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) {

4
Modules/posixmodule.c
View file

@ -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

7
Modules/socketmodule.c
View file

@ -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;
}

8
Objects/fileobject.c
View file

@ -83,11 +83,7 @@ dircheck(PyFileObject* f)
return f;
if (fstat(fileno(f->f_fp), &buf) == 0 &&
S_ISDIR(buf.st_mode)) {
#ifdef HAVE_STRERROR
char *msg = strerror(EISDIR);
#else
char *msg = "Is a directory";
#endif
PyObject *exc = PyObject_CallFunction(PyExc_IOError, "(is)",
EISDIR, msg);
PyErr_SetObject(PyExc_IOError, exc);
@ -398,11 +394,7 @@ file_dealloc(PyFileObject *f)
sts = (*f->f_close)(f->f_fp);
Py_END_ALLOW_THREADS
if (sts == EOF)
#ifdef HAVE_STRERROR
PySys_WriteStderr("close failed: [Errno %d] %s\n", errno, strerror(errno));
#else
PySys_WriteStderr("close failed: [Errno %d]\n", errno);
#endif
}
PyMem_Free(f->f_setbuf);
Py_XDECREF(f->f_name);