pwsafe, catacomb/pwsafe.py: Documentation and cleanup.

[catacomb-python] / key.c

diff --git a/key.c b/key.c
index 9a7de0ce8d44bba13da6a56b0380be96c6bc7691..2af00192e71f890f23a1457371c87681a3e4ece1 100644 (file)
--- a/key.c
+++ b/key.c
@@ -1,6 +1,4 @@
 /* -*-c-*-
 /* -*-c-*-

- *
- * $Id$

  *
  * Key files and data
  *
  *
  * Key files and data
  *


@@ -106,7 +104,7 @@ static PyMethodDef keyexc_pymethods[] = {
 
 static void keyexc_raise(int err)
 {
 
 static void keyexc_raise(int err)
 {

-  PyObject *arg = Py_BuildValue("(i)", err);
+  PyObject *arg = Py_BuildValue("(is)", err, key_strerror(err));

   if (arg) PyErr_SetObject(keyexc, arg);
   Py_XDECREF(arg);
 }
   if (arg) PyErr_SetObject(keyexc, arg);
   Py_XDECREF(arg);
 }


@@ -353,12 +351,11 @@ static PyObject *kdmeth_split(PyObject *me, PyObject *arg)
 static PyObject *kdmeth_copy(PyObject *me, PyObject *arg, PyObject *kw)
 {
   key_filter f = { 0, 0 };
 static PyObject *kdmeth_copy(PyObject *me, PyObject *arg, PyObject *kw)
 {
   key_filter f = { 0, 0 };

-  PyObject *rc = 0;

   static char *kwlist[] = { "filter", 0 };
   key_data *kd;
 
   if (!PyArg_ParseTupleAndKeywords(arg, kw, "|O&:copy", kwlist,
   static char *kwlist[] = { "filter", 0 };
   key_data *kd;
 
   if (!PyArg_ParseTupleAndKeywords(arg, kw, "|O&:copy", kwlist,

-                                  conffilter, &f))
+                                  convfilter, &f))

     return (0);
   if ((kd = key_copydata(KEYDATA_KD(me), &f)) == 0)
     RETURN_NONE;
     return (0);
   if ((kd = key_copydata(KEYDATA_KD(me), &f)) == 0)
     RETURN_NONE;


@@ -1388,16 +1385,16 @@ static PyObject *key_pynew(PyTypeObject *ty, PyObject *arg, PyObject *kw)
   PyObject *kfobj;
   uint32 id;
   char *type;
   PyObject *kfobj;
   uint32 id;
   char *type;

-  long exptime = KEXP_FOREVER;
+  unsigned long exptime = KEXP_FOREVER;

   static char *kwlist[] = { "keyfile", "id", "type", "exptime", 0 };
   key *k;
   int err;
 
   static char *kwlist[] = { "keyfile", "id", "type", "exptime", 0 };
   key *k;
   int err;
 

-  if (!PyArg_ParseTupleAndKeywords(arg, kw, "O!O&sl:new", kwlist,
+  if (!PyArg_ParseTupleAndKeywords(arg, kw, "O!O&s|O&:new", kwlist,

                                   keyfile_pytype, &kfobj, convu32, &id,
                                   keyfile_pytype, &kfobj, convu32, &id,

-                                  &type, &exptime))
+                                  &type, convulong, &exptime))

     goto end;
     goto end;

-  if ((err = key_new(KEYFILE_KF(kfobj), id, type, exptime, &k)) == 0)
+  if ((err = key_new(KEYFILE_KF(kfobj), id, type, exptime, &k)) != 0)

     KEYERR(err);
   return (key_dowrap(ty, kfobj, k));
 end:
     KEYERR(err);
   return (key_dowrap(ty, kfobj, k));
 end: