Implement straightforward suggestions from gcc warnings (remove unused

gvanrossum · gvanrossum · commit b61982bacbe0 · 2003-11-18T19:27:19.000Z
variable, add extra braces).
diff --git a/Objects/setobject.c b/Objects/setobject.c
@@ -70,8 +70,6 @@ frozenset_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
 static PyObject *
 set_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
 {
-	PyObject *iterable = NULL;
-
 	return make_new_set(type, NULL);
 }
 
@@ -781,11 +779,12 @@ If the element is not a member, raise a KeyError.");
 static PyObject *
 set_discard(PySetObject *so, PyObject *item)
 {
-	if (PyDict_DelItem(so->data, item) == -1)
+	if (PyDict_DelItem(so->data, item) == -1) {
 		if  (PyErr_ExceptionMatches(PyExc_KeyError))
 			PyErr_Clear();
 		else
 			return NULL;
+	}
 	Py_INCREF(Py_None);
 	return Py_None;
 }

Original file line number	Diff line number	Diff line change
`@@ -70,8 +70,6 @@ frozenset_new(PyTypeObject type, PyObject args, PyObject *kwds)`
`70`	`70`	`static PyObject *`
`71`	`71`	`set_new(PyTypeObject type, PyObject args, PyObject *kwds)`
`72`	`72`	`{`
`73`		`- PyObject *iterable = NULL;`
`74`		`-`
`75`	`73`	`return make_new_set(type, NULL);`
`76`	`74`	`}`
`77`	`75`
`@@ -781,11 +779,12 @@ If the element is not a member, raise a KeyError.");`
`781`	`779`	`static PyObject *`
`782`	`780`	`set_discard(PySetObject so, PyObject item)`
`783`	`781`	`{`
`784`		`- if (PyDict_DelItem(so->data, item) == -1)`
	`782`	`+ if (PyDict_DelItem(so->data, item) == -1) {`
`785`	`783`	`if (PyErr_ExceptionMatches(PyExc_KeyError))`
`786`	`784`	`PyErr_Clear();`
`787`	`785`	`else`
`788`	`786`	`return NULL;`
	`787`	`+ }`
`789`	`788`	`Py_INCREF(Py_None);`
`790`	`789`	`return Py_None;`
`791`	`790`	`}`