From: Mark Wooding <mdw@distorted.org.uk>
Date: Thu, 26 May 2016 08:26:09 +0000 (+0100)
Subject: algorithms.c: Reorder the `ghash' definitions.
X-Git-Tag: 1.2.0~49
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/catacomb-python/commitdiff_plain/07bcd7682d13c250ee7aebbada840f82eb15c405

algorithms.c: Reorder the `ghash' definitions.
---

diff --git a/algorithms.c b/algorithms.c
index 06fdc32..b2eff8b 100644
--- a/algorithms.c
+++ b/algorithms.c
@@ -772,27 +772,6 @@ static PyObject *ghmeth_hash(PyObject *me, PyObject *arg)
   RETURN_ME;
 }
 
-static PyObject *ghmeth_done(PyObject *me, PyObject *arg)
-{
-  ghash *g;
-  PyObject *rc;
-  if (!PyArg_ParseTuple(arg, ":done")) return (0);
-  g = GH_COPY(GHASH_H(me));
-  rc = bytestring_pywrap(0, g->ops->c->hashsz);
-  GH_DONE(g, PyString_AS_STRING(rc));
-  GH_DESTROY(g);
-  return (rc);
-}
-
-static PyGetSetDef gchash_pygetset[] = {
-#define GETSETNAME(op, name) gch##op##_##name
-  GET	(bufsz,			"CH.bufsz -> hash buffer size, or zero")
-  GET	(hashsz,		"CH.hashsz -> hash output size")
-  GET	(name,			"CH.name -> name of this kind of hash")
-#undef GETSETNAME
-  { 0 }
-};
-
 #define GHMETH_HASHU_(n, W, w)						\
   static PyObject *ghmeth_hashu##w(PyObject *me, PyObject *arg)		\
   {									\
@@ -827,13 +806,36 @@ static PyObject *ghmeth_hashstrz(PyObject *me, PyObject *arg)
   RETURN_ME;
 }
 
+static PyObject *ghmeth_done(PyObject *me, PyObject *arg)
+{
+  ghash *g;
+  PyObject *rc;
+  if (!PyArg_ParseTuple(arg, ":done")) return (0);
+  g = GH_COPY(GHASH_H(me));
+  rc = bytestring_pywrap(0, g->ops->c->hashsz);
+  GH_DONE(g, PyString_AS_STRING(rc));
+  GH_DESTROY(g);
+  return (rc);
+}
+
+static PyGetSetDef gchash_pygetset[] = {
+#define GETSETNAME(op, name) gch##op##_##name
+  GET	(bufsz,			"CH.bufsz -> hash buffer size, or zero")
+  GET	(hashsz,		"CH.hashsz -> hash output size")
+  GET	(name,			"CH.name -> name of this kind of hash")
+#undef GETSETNAME
+  { 0 }
+};
+
 static PyMethodDef ghash_pymethods[] = {
 #define METHNAME(name) ghmeth_##name
   METH	(hash,			"H.hash(M)")
 #define METHU_(n, W, w) METH(hashu##w, "H.hashu" #w "(WORD)")
   DOUINTCONV(METHU_)
+#undef METHU_
 #define METHBUF_(n, W, w) METH(hashbuf##w, "H.hashbuf" #w "(BYTES)")
   DOUINTCONV(METHBUF_)
+#undef METHBUF_
   METH	(hashstrz,		"H.hashstrz(STRING)")
   METH	(done,			"H.done() -> HASH")
 #undef METHNAME