algorithms.c: Slightly simplify integer-hashing methods.

[catacomb-python] / algorithms.c

diff --git a/algorithms.c b/algorithms.c
index 3e1866f060d83a047600465d79b611decc1acdbe..033176ba1d5825d09739fad1e445c104a149861d 100644 (file)
--- a/algorithms.c
+++ b/algorithms.c
@@ -788,11 +788,9 @@ static PyObject *ghmeth_hash(PyObject *me, PyObject *arg)
   static PyObject *ghmeth_hashu##w(PyObject *me, PyObject *arg)                \
   {                                                                    \
     uint##n x;                                                         \
   static PyObject *ghmeth_hashu##w(PyObject *me, PyObject *arg)                \
   {                                                                    \
     uint##n x;                                                         \

-    if (!PyArg_ParseTuple(arg, "O&:hashu" #w, convu##n, &x)) goto end; \
+    if (!PyArg_ParseTuple(arg, "O&:hashu" #w, convu##n, &x)) return (0); \

     GH_HASHU##W(GHASH_H(me), x);                                       \
     RETURN_ME;                                                         \
     GH_HASHU##W(GHASH_H(me), x);                                       \
     RETURN_ME;                                                         \

-  end:                                                                 \
-    return (0);                                                                \

   }
 DOUINTCONV(GHMETH_HASHU_)
 
   }
 DOUINTCONV(GHMETH_HASHU_)
 


@@ -1308,11 +1306,9 @@ static PyObject *polymeth_hash(PyObject *me, PyObject *arg)
   {                                                                    \
     uint##n x;                                                         \
     octet b[SZ_##W];                                                   \
   {                                                                    \
     uint##n x;                                                         \
     octet b[SZ_##W];                                                   \

-    if (!PyArg_ParseTuple(arg, "O&:hashu" #w, convu##n, &x)) goto end; \
+    if (!PyArg_ParseTuple(arg, "O&:hashu" #w, convu##n, &x)) return (0); \

     STORE##W(b, x); poly1305_hash(P1305_CTX(me), b, sizeof(b));                \
     RETURN_ME;                                                         \
     STORE##W(b, x); poly1305_hash(P1305_CTX(me), b, sizeof(b));                \
     RETURN_ME;                                                         \

-  end:                                                                 \
-    return (0);                                                                \

   }
 DOUINTCONV(POLYMETH_HASHU_)
 
   }
 DOUINTCONV(POLYMETH_HASHU_)
 


@@ -1807,12 +1803,10 @@ static PyObject *shakemeth_hash(PyObject *me, PyObject *arg)
   {                                                                    \
     uint##n x;                                                         \
     octet b[SZ_##W];                                                   \
   {                                                                    \
     uint##n x;                                                         \
     octet b[SZ_##W];                                                   \

-    if (!PyArg_ParseTuple(arg, "O&:hashu" #w, convu##n, &x)) goto end; \
-    if (shake_check(me, 0)) goto end;                                  \
+    if (!PyArg_ParseTuple(arg, "O&:hashu" #w, convu##n, &x)) return (0); \
+    if (shake_check(me, 0)) return (0);                                        \

     STORE##W(b, x); shake_hash(SHAKE_H(me), b, sizeof(b));             \
     RETURN_ME;                                                         \
     STORE##W(b, x); shake_hash(SHAKE_H(me), b, sizeof(b));             \
     RETURN_ME;                                                         \

-  end:                                                                 \
-    return (0);                                                                \

   }
 DOUINTCONV(SHAKEMETH_HASHU_)
 
   }
 DOUINTCONV(SHAKEMETH_HASHU_)