*.c: Use `Py_XDECREF' where applicable.

The Python 2.5 version of `Py_DECREF' isn't properly braced, so `if (x)
Py_DECREF(x);' provokes a dangling-`else' warning from the compiler.

diff --git a/pgen.c b/pgen.c
index 98daa73..58f6845 100644 (file)
--- a/pgen.c
+++ b/pgen.c
@@ -406,8 +406,7 @@ static void pgevent_kill(PyObject *me)
 static void pgevent_pydealloc(PyObject *me)
 {
   pgevent_pyobj *ev = (pgevent_pyobj *)me;
-  if (ev->r) Py_DECREF(ev->r);
-  FREEOBJ(me);
+  Py_XDECREF(ev->r); FREEOBJ(me);
 }
 
 #define PGEVENT_CHECK(me) do {                                         \

diff --git a/pubkey.c b/pubkey.c
index 3fc42af..ad3bcd4 100644 (file)
--- a/pubkey.c
+++ b/pubkey.c
@@ -86,8 +86,7 @@ static PyObject *dsa_setup(PyTypeObject *ty, PyObject *G, PyObject *u,
   g->rng = rng; Py_INCREF(rng); g->hash = hash; Py_INCREF(hash);
   return ((PyObject *)g);
 end:
-  if (p) Py_DECREF(p);
-  FREEOBJ(g);
+  Py_XDECREF(p); FREEOBJ(g);
   return (0);
 }
 

diff --git a/util.c b/util.c
index adb7800..aa75ea7 100644 (file)
--- a/util.c
+++ b/util.c
@@ -68,8 +68,8 @@ PyObject *getk64(kludge64 u)
   Py_DECREF(i); i = t;
   if ((rc = PyNumber_Int(i)) == 0) goto end;
 end:
-  if (i) Py_DECREF(i);
-  if (j) Py_DECREF(j);
+  Py_XDECREF(i);
+  Py_XDECREF(j);
   return (rc);
 #endif
 }
@@ -185,7 +185,7 @@ int convk64(PyObject *o, void *pp)
   rc = 1;
 
 end:
-  if (i) Py_DECREF(i);
+  Py_XDECREF(i);
   return (rc);
 }