mp.c: Factor out and export `mphash'.

[catacomb-python] / key.c

diff --git a/key.c b/key.c
index a3cd200b1189a4f9f05aec1e98b702468c898b67..cb0ac727c32cd7c49fd3b1ddbef33720fcc98f9b 100644 (file)
--- a/key.c
+++ b/key.c
@@ -414,7 +414,7 @@ end:
 static PyObject *kdmeth_lock(PyObject *me, PyObject *arg)
 {
   char *p;
 static PyObject *kdmeth_lock(PyObject *me, PyObject *arg)
 {
   char *p;

-  int n;
+  Py_ssize_t n;

   PyObject *rc = 0;
   key_data *kd;
 
   PyObject *rc = 0;
   key_data *kd;
 


@@ -445,7 +445,7 @@ end:
 static PyObject *meth__KeyData_decode(PyObject *me, PyObject *arg)
 {
   const char *p;
 static PyObject *meth__KeyData_decode(PyObject *me, PyObject *arg)
 {
   const char *p;

-  int n;
+  Py_ssize_t n;

   key_data *kd;
   PyObject *rc = 0;
 
   key_data *kd;
   PyObject *rc = 0;
 


@@ -533,7 +533,7 @@ static PyObject *keydatabin_pynew(PyTypeObject *ty,
                                  PyObject *arg, PyObject *kw)
 {
   char *p;
                                  PyObject *arg, PyObject *kw)
 {
   char *p;

-  int n;
+  Py_ssize_t n;

   unsigned f = 0;
   keydata_pyobj *me = 0;
   static char *kwlist[] = { "key", "flags", 0 };
   unsigned f = 0;
   keydata_pyobj *me = 0;
   static char *kwlist[] = { "key", "flags", 0 };


@@ -610,7 +610,7 @@ static PyObject *keydataenc_pynew(PyTypeObject *ty,
                                  PyObject *arg, PyObject *kw)
 {
   char *p;
                                  PyObject *arg, PyObject *kw)
 {
   char *p;

-  int n;
+  Py_ssize_t n;

   unsigned f = 0;
   keydata_pyobj *me = 0;
   static char *kwlist[] = { "key", "flags", 0 };
   unsigned f = 0;
   keydata_pyobj *me = 0;
   static char *kwlist[] = { "key", "flags", 0 };


@@ -636,7 +636,7 @@ end:
 static PyObject *kdemeth_lock(PyObject *me, PyObject *arg)
 {
   char *hunoz;
 static PyObject *kdemeth_lock(PyObject *me, PyObject *arg)
 {
   char *hunoz;

-  int hukairz;
+  Py_ssize_t hukairz;

   if (!PyArg_ParseTuple(arg, "s#:lock", &hunoz, &hukairz)) goto end;
   KEYERR(KERR_WRONGTYPE);
 end:
   if (!PyArg_ParseTuple(arg, "s#:lock", &hunoz, &hukairz)) goto end;
   KEYERR(KERR_WRONGTYPE);
 end:


@@ -662,7 +662,7 @@ end:
 static PyObject *kdemeth_unlock(PyObject *me, PyObject *arg)
 {
   char *p;
 static PyObject *kdemeth_unlock(PyObject *me, PyObject *arg)
 {
   char *p;

-  int n;
+  Py_ssize_t n;

   int err;
   PyObject *rc = 0;
   key_data *kd;
   int err;
   PyObject *rc = 0;
   key_data *kd;


@@ -1497,6 +1497,7 @@ static int kset_exptime(PyObject *me, PyObject *x, void *hunoz)
   key *k = KEY_K(me);
   unsigned long et;
 
   key *k = KEY_K(me);
   unsigned long et;
 

+  if (!x) NIERR("__del__");

   if (!convulong(x, &et))
     goto end;
   if (!(KEY_KF(me)->f & KF_WRITE))
   if (!convulong(x, &et))
     goto end;
   if (!(KEY_KF(me)->f & KF_WRITE))


@@ -1513,6 +1514,7 @@ static int kset_deltime(PyObject *me, PyObject *x, void *hunoz)
   key *k = KEY_K(me);
   unsigned long dt;
 
   key *k = KEY_K(me);
   unsigned long dt;
 

+  if (!x) NIERR("__del__");

   if (!convulong(x, &dt))
     goto end;
   if (dt == KEXP_FOREVER && k->exp != KEXP_FOREVER)
   if (!convulong(x, &dt))
     goto end;
   if (dt == KEXP_FOREVER && k->exp != KEXP_FOREVER)


@@ -1969,7 +1971,7 @@ static PyObject *kfmeth_qtag(PyObject *me, PyObject *arg, PyObject *kw)
   }
   key_incref(*kd);
   rc = Py_BuildValue("(s#NN)",
   }
   key_incref(*kd);
   rc = Py_BuildValue("(s#NN)",

-                    d.buf, d.len,
+                    d.buf, (Py_ssize_t)d.len,

                     key_pywrap(me, k),
                     keydata_pywrap(okd));
 end:
                     key_pywrap(me, k),
                     keydata_pywrap(okd));
 end: