/* -*-c-*-
*
- * $Id$
- *
* Reading and writing passphrases
*
* (c) 2005 Straylight/Edgeware
*/
-/*----- Licensing notice --------------------------------------------------*
+/*----- Licensing notice --------------------------------------------------*
*
* This file is part of the Python interface to Catacomb.
*
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
- *
+ *
* Catacomb/Python is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with Catacomb/Python; if not, write to the Free Software Foundation,
* Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
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;
- 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);
static void pixie_pydealloc(PyObject *me)
{
close(PIXIE_FD(me));
- FREEOBJ(me);
+ FREEOBJ(me);
}
static PyObject *pixmeth_read(PyObject *me, PyObject *arg, PyObject *kw)
{
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];
- 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));
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@ */
Py_TPFLAGS_BASETYPE,
/* @tp_doc@ */
-"Passphrase pixie connection.",
+"Pixie([socket = ?]): passphrase pixie connection.",
0, /* @tp_traverse@ */
0, /* @tp_clear@ */
0, /* @tp_richcompare@ */
0, /* @tp_weaklistoffset@ */
0, /* @tp_iter@ */
- 0, /* @tp_iternexr@ */
+ 0, /* @tp_iternext@ */
pixie_pymethods, /* @tp_methods@ */
0, /* @tp_members@ */
0, /* @tp_getset@ */
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];
- 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)))