Issue #18549: Eliminate dead code in socket_ntohl().

tiran · tiran · commit 9228837e310c · 2013-07-25T11:46:10.000+02:00
CID 982369
diff --git a/Misc/NEWS b/Misc/NEWS
@@ -52,6 +52,8 @@ Core and Builtins
 Library
 -------
 
+- Issue #18549: Eliminate dead code in socket_ntohl()
+
 - Issue #18514: Fix unreachable Py_DECREF() call in PyCData_FromBaseObj()
 
 - Issue #18513: Fix behaviour of cmath.rect w.r.t. signed zeros on OS X 10.8 +
diff --git a/Modules/socketmodule.c b/Modules/socketmodule.c
@@ -4702,8 +4702,6 @@ socket_ntohl(PyObject *self, PyObject *arg)
         return PyErr_Format(PyExc_TypeError,
                             "expected int/long, %s found",
                             Py_TYPE(arg)->tp_name);
-    if (x == (unsigned long) -1 && PyErr_Occurred())
-        return NULL;
     return PyLong_FromUnsignedLong(ntohl(x));
 }
 

Original file line number	Diff line number	Diff line change
`@@ -4702,8 +4702,6 @@ socket_ntohl(PyObject self, PyObject arg)`
`4702`	`4702`	`return PyErr_Format(PyExc_TypeError,`
`4703`	`4703`	`"expected int/long, %s found",`
`4704`	`4704`	`Py_TYPE(arg)->tp_name);`
`4705`		`- if (x == (unsigned long) -1 && PyErr_Occurred())`
`4706`		`- return NULL;`
`4707`	`4705`	`return PyLong_FromUnsignedLong(ntohl(x));`
`4708`	`4706`	`}`
`4709`	`4707`