key.c: Reformat the rest of the `KeyError' constructor.

[catacomb-python] / key.c

diff --git a/key.c b/key.c
index d91651a2fcf06f116b48c597f2a126e3884c53bc..99c25aba5d1f688365c12c2065001be0372abf9a 100644 (file)
--- a/key.c
+++ b/key.c
@@ -51,13 +51,12 @@ static PyObject *kxmeth___init__(PyObject *me, PyObject *arg)
   if (PyObject_SetAttrString(me, "err", x)) goto end;
   Py_DECREF(x); x = 0;
 
   if (PyObject_SetAttrString(me, "err", x)) goto end;
   Py_DECREF(x); x = 0;
 

-  if ((x = PyString_FromString(key_strerror(err))) == 0 ||
-      PyObject_SetAttrString(me, "errstring", x))
-    goto end;
+  x = PyString_FromString(key_strerror(err)); if (!x) goto end;
+  if (PyObject_SetAttrString(me, "errstring", x)) goto end;

   Py_DECREF(x); x = 0;
   Py_DECREF(x); x = 0;

-  if ((x = PyTuple_GetSlice(arg, 1, n)) == 0 ||
-      PyObject_SetAttrString(me, "args", x))
-    goto end;
+
+  x = PyTuple_GetSlice(arg, 1, n); if (!x) goto end;
+  if (PyObject_SetAttrString(me, "args", x)) goto end;

   Py_DECREF(x); x = 0;
   RETURN_NONE;
 
   Py_DECREF(x); x = 0;
   RETURN_NONE;