Remove the various `getuNN' functions and replace them with getulong().

[catacomb-python] / key.c

diff --git a/key.c b/key.c
index 3cd1f1e28e12f9785b10a26813f472899b93a8fc..c9accd3fd996b87f794874af9f4b355b84e4c58a 100644 (file)
--- a/key.c
+++ b/key.c
@@ -287,7 +287,7 @@ static PyObject *meth__KeyData_readflags(PyObject *me, PyObject *arg)
     goto end;
   if ((err = key_readflags(p, &end, &f, &m)) != 0)
     KEYERR(err);
     goto end;
   if ((err = key_readflags(p, &end, &f, &m)) != 0)
     KEYERR(err);

-  rc = Py_BuildValue("(NNs)", getu32(f), getu32(m), end);
+  rc = Py_BuildValue("(NNs)", getulong(f), getulong(m), end);

 end:
   return (rc);
 }
 end:
   return (rc);
 }


@@ -446,7 +446,7 @@ end:
 }
 
 static PyObject *kdget_flags(PyObject *me, void *hunoz)
 }
 
 static PyObject *kdget_flags(PyObject *me, void *hunoz)

-  { return (getu32(KEYDATA_KD(me)->e)); }
+  { return (getulong(KEYDATA_KD(me)->e)); }

 
 static PyMethodDef keydata_pymethods[] = {
 #define METHNAME(func) kdmeth_##func
 
 static PyMethodDef keydata_pymethods[] = {
 #define METHNAME(func) kdmeth_##func


@@ -1463,7 +1463,7 @@ static PyObject *kmeth_fingerprint(PyObject *me,
 }
 
 static PyObject *kget_id(PyObject *me, void *hunoz)
 }
 
 static PyObject *kget_id(PyObject *me, void *hunoz)

-  { return (getu32(KEY_K(me)->id)); }
+  { return (getulong(KEY_K(me)->id)); }

 static PyObject *kget_file(PyObject *me, void *hunoz)
   { RETURN_OBJ(KEY_KFOBJ(me)); }
 static PyObject *kget_type(PyObject *me, void *hunoz)
 static PyObject *kget_file(PyObject *me, void *hunoz)
   { RETURN_OBJ(KEY_KFOBJ(me)); }
 static PyObject *kget_type(PyObject *me, void *hunoz)