~mdw
/
catacomb-python
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
pyke/pyke.h: Add a `MEMBER' variant with explicit member name.
[catacomb-python]
/
buffer.c
diff --git
a/buffer.c
b/buffer.c
index
49ed9d2
..
690c7cd
100644
(file)
--- a/
buffer.c
+++ b/
buffer.c
@@
-107,10
+107,9
@@
end:
}
#define RBMETH_GETU_(n, W, w) \
}
#define RBMETH_GETU_(n, W, w) \
- static PyObject *rbmeth_getu##w(PyObject *me
, PyObject *arg)
\
+ static PyObject *rbmeth_getu##w(PyObject *me
)
\
{ \
uint##n x; \
{ \
uint##n x; \
- if (!PyArg_ParseTuple(arg, ":getu" #w)) goto end; \
if (buf_getu##w(BUF_B(me), &x)) BUFERR("buffer exhausted"); \
if (MASK##W <= ULONG_MAX) return (getulong(x)); \
else { kludge64 y; ASSIGN64(y, x); return (getk64(y)); } \
if (buf_getu##w(BUF_B(me), &x)) BUFERR("buffer exhausted"); \
if (MASK##W <= ULONG_MAX) return (getulong(x)); \
else { kludge64 y; ASSIGN64(y, x); return (getk64(y)); } \
@@
-120,11
+119,10
@@
end:
DOUINTCONV(RBMETH_GETU_)
#define RBMETH_GETBLK_(n, W, w) \
DOUINTCONV(RBMETH_GETU_)
#define RBMETH_GETBLK_(n, W, w) \
- static PyObject *rbmeth_getblk##w(PyObject *me
, PyObject *arg)
\
+ static PyObject *rbmeth_getblk##w(PyObject *me
)
\
{ \
size_t sz; \
char *q; \
{ \
size_t sz; \
char *q; \
- if (!PyArg_ParseTuple(arg, ":getblk" #w)) goto end; \
if ((q = buf_getmem##w(BUF_B(me), &sz)) == 0) \
BUFERR("buffer exhausted"); \
return (bytestring_pywrap(q, sz)); \
if ((q = buf_getmem##w(BUF_B(me), &sz)) == 0) \
BUFERR("buffer exhausted"); \
return (bytestring_pywrap(q, sz)); \
@@
-134,11
+132,10
@@
DOUINTCONV(RBMETH_GETU_)
BUF_DOSUFFIXES(RBMETH_GETBLK_)
#define RBMETH_GETBUF_(n, W, w) \
BUF_DOSUFFIXES(RBMETH_GETBLK_)
#define RBMETH_GETBUF_(n, W, w) \
- static PyObject *rbmeth_getbuf##w(PyObject *me
, PyObject *arg)
\
+ static PyObject *rbmeth_getbuf##w(PyObject *me
)
\
{ \
buf_pyobj *b; \
buf bb; \
{ \
buf_pyobj *b; \
buf bb; \
- if (!PyArg_ParseTuple(arg, ":getbuf" #w)) goto end; \
if (buf_getbuf##w(BUF_B(me), &bb)) BUFERR("buffer exhausted"); \
b = PyObject_NEW(buf_pyobj, rbuf_pytype); \
b->b = bb; \
if (buf_getbuf##w(BUF_B(me), &bb)) BUFERR("buffer exhausted"); \
b = PyObject_NEW(buf_pyobj, rbuf_pytype); \
b->b = bb; \
@@
-150,20
+147,18
@@
BUF_DOSUFFIXES(RBMETH_GETBLK_)
}
BUF_DOSUFFIXES(RBMETH_GETBUF_)
}
BUF_DOSUFFIXES(RBMETH_GETBUF_)
-static PyObject *rbmeth_getmp(PyObject *me
, PyObject *arg
)
+static PyObject *rbmeth_getmp(PyObject *me)
{
mp *x;
{
mp *x;
- if (!PyArg_ParseTuple(arg, ":getmp")) goto end;
if ((x = buf_getmp(BUF_B(me))) == 0) BUFERR("buffer exhausted");
return (mp_pywrap(x));
end:
return (0);
}
if ((x = buf_getmp(BUF_B(me))) == 0) BUFERR("buffer exhausted");
return (mp_pywrap(x));
end:
return (0);
}
-static PyObject *rbmeth_getgf(PyObject *me
, PyObject *arg
)
+static PyObject *rbmeth_getgf(PyObject *me)
{
mp *x;
{
mp *x;
- if (!PyArg_ParseTuple(arg, ":getgf")) goto end;
if ((x = buf_getmp(BUF_B(me))) == 0) BUFERR("buffer exhausted");
return (gf_pywrap(x));
end:
if ((x = buf_getmp(BUF_B(me))) == 0) BUFERR("buffer exhausted");
return (gf_pywrap(x));
end:
@@
-260,16
+255,16
@@
static const PyMethodDef rbuf_pymethods[] = {
METH (skip, "RBUF.skip(N)")
METH (get, "RBUF.get(N) -> BYTES")
#define RBMETH_DECL_GETU_(n, W, w) \
METH (skip, "RBUF.skip(N)")
METH (get, "RBUF.get(N) -> BYTES")
#define RBMETH_DECL_GETU_(n, W, w) \
-
METH(getu##w,
"RBUF.getu" #w "() -> INT")
+
NAMETH(getu##w,
"RBUF.getu" #w "() -> INT")
DOUINTCONV(RBMETH_DECL_GETU_)
#define RBMETH_DECL_GETBLK_(n, W, w) \
DOUINTCONV(RBMETH_DECL_GETU_)
#define RBMETH_DECL_GETBLK_(n, W, w) \
-
METH(getblk##w,
"RBUF.getblk" #w "() -> BYTES")
+
NAMETH(getblk##w,
"RBUF.getblk" #w "() -> BYTES")
BUF_DOSUFFIXES(RBMETH_DECL_GETBLK_)
#define RBMETH_DECL_GETBUF_(n, W, w) \
BUF_DOSUFFIXES(RBMETH_DECL_GETBLK_)
#define RBMETH_DECL_GETBUF_(n, W, w) \
-
METH(getbuf##w,
"RBUF.getbuf" #w "() -> RBUF'")
+
NAMETH(getbuf##w,
"RBUF.getbuf" #w "() -> RBUF'")
BUF_DOSUFFIXES(RBMETH_DECL_GETBUF_)
BUF_DOSUFFIXES(RBMETH_DECL_GETBUF_)
-
METH (getmp,
"RBUF.getmp() -> X")
-
METH (getgf,
"RBUF.getgf() -> X")
+
NAMETH(getmp,
"RBUF.getmp() -> X")
+
NAMETH(getgf,
"RBUF.getgf() -> X")
KWMETH(getecpt, "RBUF.getecpt([curve = None]) -> P")
METH (getecptraw, "RBUF.getecptraw(CURVE) -> P")
METH (getge, "RBUF.getge(GROUP) -> X")
KWMETH(getecpt, "RBUF.getecpt([curve = None]) -> P")
METH (getecptraw, "RBUF.getecptraw(CURVE) -> P")
METH (getge, "RBUF.getge(GROUP) -> X")