summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNeal Norwitz <nnorwitz@gmail.com>2006-02-13 00:35:21 (GMT)
committerNeal Norwitz <nnorwitz@gmail.com>2006-02-13 00:35:21 (GMT)
commit389cea8efccabb7e31b40325a512c2cf626a1b01 (patch)
tree356e43f54c00ab2f47009218e05f1ef2a9915496
parentc45251a48542e0074ad9865143359bdfec0f8467 (diff)
downloadcpython-389cea8efccabb7e31b40325a512c2cf626a1b01.zip
cpython-389cea8efccabb7e31b40325a512c2cf626a1b01.tar.gz
cpython-389cea8efccabb7e31b40325a512c2cf626a1b01.tar.bz2
Try to improve name based on discussion on python-checkins with Jim Jewett
-rw-r--r--Modules/_ssl.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/Modules/_ssl.c b/Modules/_ssl.c
index 0e79b54..5f541f5 100644
--- a/Modules/_ssl.c
+++ b/Modules/_ssl.c
@@ -74,7 +74,7 @@ typedef enum {
SOCKET_IS_BLOCKING,
SOCKET_HAS_TIMED_OUT,
SOCKET_HAS_BEEN_CLOSED,
- SOCKET_INVALID,
+ SOCKET_TOO_LARGE_FOR_SELECT,
SOCKET_OPERATION_OK
} timeout_state;
@@ -273,7 +273,7 @@ newPySSLObject(PySocketSockObject *Sock, char *key_file, char *cert_file)
} else if (sockstate == SOCKET_HAS_BEEN_CLOSED) {
PyErr_SetString(PySSLErrorObject, "Underlying socket has been closed.");
goto fail;
- } else if (sockstate == SOCKET_INVALID) {
+ } else if (sockstate == SOCKET_TOO_LARGE_FOR_SELECT) {
PyErr_SetString(PySSLErrorObject, "Underlying socket too large for select().");
goto fail;
} else if (sockstate == SOCKET_IS_NONBLOCKING) {
@@ -379,7 +379,7 @@ check_socket_and_wait_for_timeout(PySocketSockObject *s, int writing)
/* Guard against socket too large for select*/
#ifndef Py_SOCKET_FD_CAN_BE_GE_FD_SETSIZE
if (s->sock_fd >= FD_SETSIZE)
- return SOCKET_INVALID;
+ return SOCKET_TOO_LARGE_FOR_SELECT;
#endif
/* Construct the arguments to select */
@@ -419,7 +419,7 @@ static PyObject *PySSL_SSLwrite(PySSLObject *self, PyObject *args)
} else if (sockstate == SOCKET_HAS_BEEN_CLOSED) {
PyErr_SetString(PySSLErrorObject, "Underlying socket has been closed.");
return NULL;
- } else if (sockstate == SOCKET_INVALID) {
+ } else if (sockstate == SOCKET_TOO_LARGE_FOR_SELECT) {
PyErr_SetString(PySSLErrorObject, "Underlying socket too large for select().");
return NULL;
}
@@ -480,7 +480,7 @@ static PyObject *PySSL_SSLread(PySSLObject *self, PyObject *args)
PyErr_SetString(PySSLErrorObject, "The read operation timed out");
Py_DECREF(buf);
return NULL;
- } else if (sockstate == SOCKET_INVALID) {
+ } else if (sockstate == SOCKET_TOO_LARGE_FOR_SELECT) {
PyErr_SetString(PySSLErrorObject, "Underlying socket too large for select().");
return NULL;
}