From: Jeremy Hylton <jeremy@alum.mit.edu>
Date: Thu, 11 Oct 2001 17:27:58 +0000 (+0000)
Subject: Use PySocket_Err() instead of PyErr_SetFromErrno().
X-Git-Tag: v2.2.1c1~1336
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e2adc6c205db6087b3a8f00a245cfb06905b8ae5;p=thirdparty%2FPython%2Fcpython.git

Use PySocket_Err() instead of PyErr_SetFromErrno().

The former does the right thing on Windows, the latter does not.
---

diff --git a/Modules/socketmodule.c b/Modules/socketmodule.c
index c492153bc79b..56e370099c11 100644
--- a/Modules/socketmodule.c
+++ b/Modules/socketmodule.c
@@ -850,7 +850,7 @@ getsockaddrarg(PySocketSockObject *s, PyObject *args,
 		strncpy(ifr.ifr_name, interfaceName, sizeof(ifr.ifr_name));
 		ifr.ifr_name[(sizeof(ifr.ifr_name))-1] = '\0';
 		if (ioctl(s->sock_fd, SIOCGIFINDEX, &ifr) < 0) {
-			PyErr_SetFromErrno(PySocket_Error);
+			PySocket_Err();
 			return 0;
 		}
 		addr = &(s->sock_addr.ll);
@@ -2530,8 +2530,7 @@ PySSL_SetError(SSL *ssl, int ret)
 			/* the underlying BIO reported an I/O error */
 			Py_DECREF(v);
 			Py_DECREF(n);
-			PyErr_SetFromErrno(PyExc_IOError);
-			return NULL;
+			return PySocket_Err();
 		} else {
 			/* XXX Protected by global interpreter lock */
 			errstr = ERR_error_string(e, NULL);