chiark / gitweb /
Fix a few minor warnings.
authorMark Wooding <mdw@distorted.org.uk>
Sun, 23 Jun 2013 08:04:24 +0000 (09:04 +0100)
committerMark Wooding <mdw@distorted.org.uk>
Sun, 23 Jun 2013 08:04:24 +0000 (09:04 +0100)
ec.c
group.c
rand.c
util.c

diff --git a/ec.c b/ec.c
index 2b2dba0322f05d66d8a33118abea4a7bc672782f..21aa352990ebdaaa0bfc6a23b3dc5317810d7c3b 100644 (file)
--- a/ec.c
+++ b/ec.c
@@ -1527,7 +1527,7 @@ static PyObject *namedcurves(void)
     }
     c = PyInt_FromLong(i);
   found:
-    PyDict_SetItemString(d, (/*unconst*/ char *)ectab[i].name, c);
+    PyDict_SetItemString(d, (/*unconst*/ char *)p, c);
     Py_DECREF(c);
   }
   ncurves = i;
diff --git a/group.c b/group.c
index 544a8c724a79df991d1cf36cb57a0ef46f15f622..1f733a092d87f49f3f2d7fb483d3d9ed85e3acdc 100644 (file)
--- a/group.c
+++ b/group.c
@@ -225,7 +225,7 @@ static PyObject *namedgroups(const pentry *pp, int *ne)
     }
     c = PyInt_FromLong(i);
   found:
-    PyDict_SetItemString(d, (/*unconst*/ char *)pp[i].name, c);
+    PyDict_SetItemString(d, (/*unconst*/ char *)p, c);
     Py_DECREF(c);
   }
   *ne = i;
diff --git a/rand.c b/rand.c
index 9f086e60a6d397c294b47d04d7e15712ae182788..3bcd0a9166840eb7a9d4d6dc51f2d5674e708d49 100644 (file)
--- a/rand.c
+++ b/rand.c
@@ -978,7 +978,7 @@ static PyObject *dsarand_pynew(PyTypeObject *ty, PyObject *arg, PyObject *kw)
     goto end;
   rc = grand_dopywrap(ty, dsarand_create(p, sz), f_freeme);
 end:
-  return (0);
+  return (rc);
 }
 
 static PyObject *drget_seed(PyObject *me, void *hunoz)
diff --git a/util.c b/util.c
index 96a4052df31ed847ee277208339da5a5eab6b2df..f56c7fd0c52524665deb176d3ac5200b978903dc 100644 (file)
--- a/util.c
+++ b/util.c
@@ -163,7 +163,7 @@ void *newtype(PyTypeObject *metaty,
     ty->ht_name = PyString_FromString(ty->ht_type.tp_name);
   if (ty->ht_name)
     ty->ht_type.tp_name = PyString_AS_STRING(ty->ht_name);
-  PyObject_INIT(&ty->ht_type, metaty);
+  DISCARD(PyObject_INIT(&ty->ht_type, metaty));
   Py_INCREF(metaty);
   return (ty);
 }