~mdw
/
pyke
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
catacomb.c, util.c: Export `modname' and set it in main entry point.
[pyke]
/
util.c
diff --git
a/util.c
b/util.c
index
29f7d12
..
55de789
100644
(file)
--- a/
util.c
+++ b/
util.c
@@
-32,7
+32,7
@@
/*----- External values ---------------------------------------------------*/
/*----- External values ---------------------------------------------------*/
-
static
PyObject *modname = 0;
+PyObject *modname = 0;
PyObject *home_module = 0;
/*----- Conversions -------------------------------------------------------*/
PyObject *home_module = 0;
/*----- Conversions -------------------------------------------------------*/
@@
-68,8
+68,8
@@
PyObject *getk64(kludge64 u)
Py_DECREF(i); i = t;
if ((rc = PyNumber_Int(i)) == 0) goto end;
end:
Py_DECREF(i); i = t;
if ((rc = PyNumber_Int(i)) == 0) goto end;
end:
-
if (i) Py_
DECREF(i);
-
if (j) Py_
DECREF(j);
+
Py_X
DECREF(i);
+
Py_X
DECREF(j);
return (rc);
#endif
}
return (rc);
#endif
}
@@
-185,7
+185,7
@@
int convk64(PyObject *o, void *pp)
rc = 1;
end:
rc = 1;
end:
-
if (i) Py_
DECREF(i);
+
Py_X
DECREF(i);
return (rc);
}
return (rc);
}
@@
-504,7
+504,7
@@
static PyTypeObject itemiter_pytype_skel = {
Py_TPFLAGS_BASETYPE,
/* @tp_doc@ */
Py_TPFLAGS_BASETYPE,
/* @tp_doc@ */
-
"Iterates over the key
s of a mapping.",
+
"Iterates over the item
s of a mapping.",
0, /* @tp_traverse@ */
0, /* @tp_clear@ */
0, /* @tp_traverse@ */
0, /* @tp_clear@ */
@@
-562,7
+562,7
@@
static PyTypeObject valiter_pytype_skel = {
Py_TPFLAGS_BASETYPE,
/* @tp_doc@ */
Py_TPFLAGS_BASETYPE,
/* @tp_doc@ */
-"Iterates over the values of a mapping.",
+
"Iterates over the values of a mapping.",
0, /* @tp_traverse@ */
0, /* @tp_clear@ */
0, /* @tp_traverse@ */
0, /* @tp_clear@ */
@@
-737,13
+737,15
@@
end:
return (rc);
}
return (rc);
}
-static c
har *
def_kwlist[] = { "key", "default", 0 };
+static c
onst char *const
def_kwlist[] = { "key", "default", 0 };
PyObject *gmapmeth_get(PyObject *me, PyObject *arg, PyObject *kw)
{
PyObject *k, *def = Py_None, *v;
PyObject *gmapmeth_get(PyObject *me, PyObject *arg, PyObject *kw)
{
PyObject *k, *def = Py_None, *v;
- if (!PyArg_ParseTupleAndKeywords(arg, kw, "O|O:get", def_kwlist, &k, &def))
+ if (!PyArg_ParseTupleAndKeywords(arg, kw, "O|O:get",
+ (/*unconst*/ char **)def_kwlist,
+ &k, &def))
return (0);
if ((v = PyObject_GetItem(me, k)) != 0) return (v);
PyErr_Clear();
return (0);
if ((v = PyObject_GetItem(me, k)) != 0) return (v);
PyErr_Clear();
@@
-755,7
+757,8
@@
PyObject *gmapmeth_setdefault(PyObject *me, PyObject *arg, PyObject *kw)
PyObject *k, *def = Py_None, *v;
if (!PyArg_ParseTupleAndKeywords(arg, kw, "O|O:setdefault",
PyObject *k, *def = Py_None, *v;
if (!PyArg_ParseTupleAndKeywords(arg, kw, "O|O:setdefault",
- def_kwlist, &k, &def))
+ (/*unconst*/ char **)def_kwlist,
+ &k, &def))
return (0);
if ((v = PyObject_GetItem(me, k)) != 0) return (v);
PyErr_Clear();
return (0);
if ((v = PyObject_GetItem(me, k)) != 0) return (v);
PyErr_Clear();
@@
-767,7
+770,9
@@
PyObject *gmapmeth_pop(PyObject *me, PyObject *arg, PyObject *kw)
{
PyObject *k, *def = 0, *v;
{
PyObject *k, *def = 0, *v;
- if (!PyArg_ParseTupleAndKeywords(arg, kw, "O|O:pop", def_kwlist, &k, &def))
+ if (!PyArg_ParseTupleAndKeywords(arg, kw, "O|O:pop",
+ (/*unconst*/ char **)def_kwlist,
+ &k, &def))
return (0);
if ((v = PyObject_GetItem(me, k)) != 0) {
PyObject_DelItem(me, k);
return (0);
if ((v = PyObject_GetItem(me, k)) != 0) {
PyObject_DelItem(me, k);
@@
-840,14
+845,13
@@
static PyObject *meth__set_home_module(PyObject *me, PyObject *arg)
static const PyMethodDef methods[] = {
#define METHNAME(func) meth_##func
static const PyMethodDef methods[] = {
#define METHNAME(func) meth_##func
- METH (_set_home_module,
"_set_home_module(MOD)")
+ METH (_set_home_module, "_set_home_module(MOD)")
#undef METHNAME
{ 0 }
};
void util_pyinit(void)
{
#undef METHNAME
{ 0 }
};
void util_pyinit(void)
{
- modname = PyString_FromString("catacomb");
INITTYPE(itemiter, root);
INITTYPE(valiter, root);
addmethods(methods);
INITTYPE(itemiter, root);
INITTYPE(valiter, root);
addmethods(methods);