~mdw
/
catacomb-python
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
.gdbinit: Delete this obsolete file.
[catacomb-python]
/
passphrase.c
diff --git
a/passphrase.c
b/passphrase.c
index
3d8c84b
..
1796629
100644
(file)
--- a/
passphrase.c
+++ b/
passphrase.c
@@
-54,11
+54,11
@@
end:
static PyObject *pixie_pynew(PyTypeObject *ty, PyObject *arg, PyObject *kw)
{
pixie_pyobj *rc = 0;
static PyObject *pixie_pynew(PyTypeObject *ty, PyObject *arg, PyObject *kw)
{
pixie_pyobj *rc = 0;
-
char *
kwlist[] = { "socket", 0 };
+
static const char *const
kwlist[] = { "socket", 0 };
char *sock = 0;
int fd;
char *sock = 0;
int fd;
- if (!PyArg_ParseTupleAndKeywords(arg, kw, "|s:new",
kwlist
, &sock))
+ if (!PyArg_ParseTupleAndKeywords(arg, kw, "|s:new",
KWLIST
, &sock))
goto end;
if ((fd = pixie_open(sock)) < 0)
OSERR(sock);
goto end;
if ((fd = pixie_open(sock)) < 0)
OSERR(sock);
@@
-78,12
+78,12
@@
static PyObject *pixmeth_read(PyObject *me, PyObject *arg, PyObject *kw)
{
unsigned mode = PMODE_READ;
char *tag;
{
unsigned mode = PMODE_READ;
char *tag;
-
char *
kwlist[] = { "tag", "mode", 0 };
+
static const char *const
kwlist[] = { "tag", "mode", 0 };
PyObject *rc = 0;
int r;
char buf[1024];
PyObject *rc = 0;
int r;
char buf[1024];
- if (!PyArg_ParseTupleAndKeywords(arg, kw, "s|O&:read",
kwlist
,
+ if (!PyArg_ParseTupleAndKeywords(arg, kw, "s|O&:read",
KWLIST
,
&tag, convuint, &mode))
goto end;
r = pixie_read(PIXIE_FD(me), tag, mode, buf, sizeof(buf));
&tag, convuint, &mode))
goto end;
r = pixie_read(PIXIE_FD(me), tag, mode, buf, sizeof(buf));
@@
-129,7
+129,7
@@
static PyMethodDef pixie_pymethods[] = {
static PyTypeObject pixie_pytype_skel = {
PyObject_HEAD_INIT(0) 0, /* Header */
static PyTypeObject pixie_pytype_skel = {
PyObject_HEAD_INIT(0) 0, /* Header */
- "
catacomb.Pixie",
/* @tp_name@ */
+ "
Pixie",
/* @tp_name@ */
sizeof(pixie_pyobj), /* @tp_basicsize@ */
0, /* @tp_itemsize@ */
sizeof(pixie_pyobj), /* @tp_basicsize@ */
0, /* @tp_itemsize@ */
@@
-152,7
+152,7
@@
static PyTypeObject pixie_pytype_skel = {
Py_TPFLAGS_BASETYPE,
/* @tp_doc@ */
Py_TPFLAGS_BASETYPE,
/* @tp_doc@ */
-"Passphrase pixie connection.",
+"P
ixie([socket = ?]): p
assphrase pixie connection.",
0, /* @tp_traverse@ */
0, /* @tp_clear@ */
0, /* @tp_traverse@ */
0, /* @tp_clear@ */
@@
-182,10
+182,10
@@
static PyObject *meth_ppread(PyObject *me, PyObject *arg, PyObject *kw)
char *tag;
unsigned f = PMODE_READ;
PyObject *rc = 0;
char *tag;
unsigned f = PMODE_READ;
PyObject *rc = 0;
-
char *
kwlist[] = { "tag", "mode", 0 };
+
static const char *const
kwlist[] = { "tag", "mode", 0 };
char buf[1024];
char buf[1024];
- if (!PyArg_ParseTupleAndKeywords(arg, kw, "s|O&:ppread",
kwlist
,
+ if (!PyArg_ParseTupleAndKeywords(arg, kw, "s|O&:ppread",
KWLIST
,
&tag, convuint, &f))
goto end;
if (passphrase_read(tag, f, buf, sizeof(buf)))
&tag, convuint, &f))
goto end;
if (passphrase_read(tag, f, buf, sizeof(buf)))