~mdw
/
catacomb-python
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
catacomb/pwsafe.py: Mark abstract storage-backend classes as lacking `NAME'.
[catacomb-python]
/
catacomb.c
diff --git
a/catacomb.c
b/catacomb.c
index
a914bff
..
c1e91ff
100644
(file)
--- a/
catacomb.c
+++ b/
catacomb.c
@@
-128,7
+128,7
@@
static void *thingtab_gmlookup(PyObject *me, PyObject *key, unsigned *f)
{
const char *p;
{
const char *p;
- p =
PyString_AsString
(key); if (!p) return (0);
+ p =
TEXT_STR
(key); if (!p) return (0);
return (sym_find(THINGTAB_T(me), p, -1, 0, f));
}
return (sym_find(THINGTAB_T(me), p, -1, 0, f));
}
@@
-139,7
+139,7
@@
static void *thingtab_gmiternext(PyObject *me, void *i)
{ sym_iter *it = i; void *e; SYM_NEXT(it, e); return (e); }
static PyObject *thingtab_gmentrykey(PyObject *me, void *e)
{ sym_iter *it = i; void *e; SYM_NEXT(it, e); return (e); }
static PyObject *thingtab_gmentrykey(PyObject *me, void *e)
- { return (
PyString_FromString
(SYM_NAME(e))); }
+ { return (
TEXT_FROMSTR
(SYM_NAME(e))); }
static PyObject *thingtab_gmentryvalue(PyObject *me, void *e)
{ PyObject *rc = THING_VAL(e); RETURN_OBJ(rc); }
static PyObject *thingtab_gmentryvalue(PyObject *me, void *e)
{ PyObject *rc = THING_VAL(e); RETURN_OBJ(rc); }
@@
-231,7
+231,7
@@
PyObject *make_grouptab(const void *tab, size_t esz,
}
static const PyTypeObject thingtab_pytype_skel = {
}
static const PyTypeObject thingtab_pytype_skel = {
- Py
Object_HEAD_INIT(0) 0,
/* Header */
+ Py
VarObject_HEAD_INIT(0, 0)
/* Header */
"_MiscTable", /* @tp_name@ */
sizeof(thingtab_pyobj), /* @tp_basicsize@ */
0, /* @tp_itemsize@ */
"_MiscTable", /* @tp_name@ */
sizeof(thingtab_pyobj), /* @tp_basicsize@ */
0, /* @tp_itemsize@ */
@@
-325,7
+325,7
@@
EXPORT void init_base(void)
{
PyObject *mod;
{
PyObject *mod;
- modname =
PyString_FromString
("catacomb");
+ modname =
TEXT_FROMSTR
("catacomb");
addmethods(methods);
INIT_MODULES;
INITTYPE(thingtab, root);
addmethods(methods);
INIT_MODULES;
INITTYPE(thingtab, root);