X-Git-Url: https://git.distorted.org.uk/~mdw/catacomb-python/blobdiff_plain/0e29d9164d5cc4e3cafa509cda19de2e025446c1..3383fdc17163be5cab0f0a632ffc64816a3e12ba:/key.c

diff --git a/key.c b/key.c
index 6a601c9..cb0ac72 100644
--- a/key.c
+++ b/key.c
@@ -414,7 +414,7 @@ end:
 static PyObject *kdmeth_lock(PyObject *me, PyObject *arg)
 {
   char *p;
-  int n;
+  Py_ssize_t n;
   PyObject *rc = 0;
   key_data *kd;
 
@@ -445,7 +445,7 @@ end:
 static PyObject *meth__KeyData_decode(PyObject *me, PyObject *arg)
 {
   const char *p;
-  int n;
+  Py_ssize_t n;
   key_data *kd;
   PyObject *rc = 0;
 
@@ -467,7 +467,7 @@ static PyMethodDef keydata_pymethods[] = {
   METH	(split,			"KD.split()")
   KWMETH(write,			"KD.write(filter = <any>) -> STRING")
   KWMETH(encode,		"KD.encode(filter = <any>) -> BYTES")
-  KWMETH(copy,			"KD.encode(filter = <any>) -> KD")
+  KWMETH(copy,			"KD.copy(filter = <any>) -> KD")
   METH	(plock,			"KD.plock(TAG) -> ENCRYPTED-KD")
   METH	(lock,			"KD.lock(KEY) -> ENCRYPTED-KD")
 #undef METHNAME
@@ -533,7 +533,7 @@ static PyObject *keydatabin_pynew(PyTypeObject *ty,
 				  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 };
@@ -610,7 +610,7 @@ static PyObject *keydataenc_pynew(PyTypeObject *ty,
 				  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 };
@@ -636,7 +636,7 @@ end:
 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:
@@ -662,7 +662,7 @@ end:
 static PyObject *kdemeth_unlock(PyObject *me, PyObject *arg)
 {
   char *p;
-  int n;
+  Py_ssize_t n;
   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;
 
+  if (!x) NIERR("__del__");
   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;
 
+  if (!x) NIERR("__del__");
   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)",
-		     d.buf, d.len,
+		     d.buf, (Py_ssize_t)d.len,
 		     key_pywrap(me, k),
 		     keydata_pywrap(okd));
 end:
@@ -2081,7 +2083,7 @@ static PyMethodDef methods[] = {
 	   "KeyData.readflags(STRING) -> (FLAGS, MASK, REST)")
   METH	(_KeyData_writeflags,	"KeyData.writeflags(FLAGS) -> STRING")
   METH	(_KeyData_read,		"KeyData.read(STRING) -> (KD, REST)")
-  METH	(_KeyData_decode,	"KeyData.read(BYTES) -> KD")
+  METH	(_KeyData_decode,	"KeyData.decode(BYTES) -> KD")
   METH	(barf,			"barf(ERR)")
 #undef METHNAME
   { 0 }