From: Georg Brandl <georg@python.org>
Date: Wed, 26 Mar 2008 12:57:47 +0000 (+0000)
Subject: Fix and simplify error handling, silencing a compiler warning.
X-Git-Tag: v2.6a2~95
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=018a3622e8f0662fd3e82c2e1ad90d14131b1d3e;p=python

Fix and simplify error handling, silencing a compiler warning.
---

diff --git a/Modules/selectmodule.c b/Modules/selectmodule.c
index de38fe60e5..83a6538a41 100644
--- a/Modules/selectmodule.c
+++ b/Modules/selectmodule.c
@@ -991,6 +991,7 @@ pyepoll_poll(pyEpoll_Object *self, PyObject *args, PyObject *kwds)
 	else if (dtimeout * 1000.0 > INT_MAX) {
 		PyErr_SetString(PyExc_OverflowError,
 				"timeout is too large");
+		return NULL;
 	}
 	else {
 		timeout = (int)(dtimeout * 1000.0);
@@ -1027,19 +1028,15 @@ pyepoll_poll(pyEpoll_Object *self, PyObject *args, PyObject *kwds)
 	}
 
 	for (i = 0; i < nfds; i++) {
-		etuple = Py_BuildValue("iI", evs[i].data.fd,
-				       evs[i].events);
+		etuple = Py_BuildValue("iI", evs[i].data.fd, evs[i].events);
 		if (etuple == NULL) {
+			Py_CLEAR(elist);
 			goto error;
 		}
 		PyList_SET_ITEM(elist, i, etuple);
 	}
 
-	if (0) {
-	    error:
-		Py_CLEAR(elist);
-		Py_XDECREF(etuple);
-	}
+    error:
 	PyMem_Free(evs);
 	return elist;
 }