traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Renamed in a grand-ee-ous way!

This commit is contained in:
Roger E. Masse 1996-12-17 19:55:33 +00:00
parent d87e0bf651
commit b15bef85a7
1 changed files with 175 additions and 170 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

195
Modules/gdbmmodule.c
View File

@ -36,8 +36,7 @@ PERFORMANCE OF THIS SOFTWARE.
/* DBM module using dictionary interface */ /* DBM module using dictionary interface */
#include "allobjects.h" #include "Python.h"
#include "modsupport.h"
#include <sys/types.h> #include <sys/types.h>
#include <sys/stat.h> #include <sys/stat.h>
@ -45,39 +44,40 @@ PERFORMANCE OF THIS SOFTWARE.
#include "gdbm.h" #include "gdbm.h"
typedef struct { typedef struct {
OB_HEAD PyObject_HEAD
int di_size; /* -1 means recompute */ int di_size; /* -1 means recompute */
GDBM_FILE di_dbm; GDBM_FILE di_dbm;
} dbmobject; } dbmobject;
staticforward typeobject Dbmtype; staticforward PyTypeObject Dbmtype;
#define is_dbmobject(v) ((v)->ob_type == &Dbmtype) #define is_dbmobject(v) ((v)->ob_type == &Dbmtype)
static object *DbmError; static PyObject *DbmError;
static object * static PyObject *
newdbmobject(file, flags, mode) newdbmobject(file, flags, mode)
char *file; char *file;
int flags; int flags;
int mode; int mode;
{ {
dbmobject *dp; dbmobject *dp;
dp = NEWOBJ(dbmobject, &Dbmtype); dp = PyObject_NEW(dbmobject, &Dbmtype);
if (dp == NULL) if (dp == NULL)
return NULL; return NULL;
dp->di_size = -1; dp->di_size = -1;
errno = 0; errno = 0;
if ( (dp->di_dbm = gdbm_open(file, 0, flags, mode, NULL)) == 0 ) { if ( (dp->di_dbm = gdbm_open(file, 0, flags, mode, NULL)) == 0 ) {
if (errno != 0) if (errno != 0)
err_errno(DbmError); PyErr_SetFromErrno(DbmError);
else else
err_setstr(DbmError, (char *) gdbm_strerror(gdbm_errno)); PyErr_SetString(DbmError,
DECREF(dp); (char *) gdbm_strerror(gdbm_errno));
Py_DECREF(dp);
return NULL; return NULL;
} }
return (object *)dp; return (PyObject *)dp;
} }
/* Methods */ /* Methods */
@ -88,7 +88,7 @@ dbm_dealloc(dp)
{ {
if ( dp->di_dbm ) if ( dp->di_dbm )
gdbm_close(dp->di_dbm); gdbm_close(dp->di_dbm);
DEL(dp); PyMem_DEL(dp);
} }
static int static int
@ -112,23 +112,24 @@ dbm_length(dp)
return dp->di_size; return dp->di_size;
} }
static object * static PyObject *
dbm_subscript(dp, key) dbm_subscript(dp, key)
dbmobject *dp; dbmobject *dp;
register object *key; register PyObject *key;
{ {
object *v; PyObject *v;
datum drec, krec; datum drec, krec;
if (!getargs(key, "s#", &krec.dptr, &krec.dsize) ) if (!PyArg_Parse(key, "s#", &krec.dptr, &krec.dsize) )
return NULL; return NULL;
drec = gdbm_fetch(dp->di_dbm, krec); drec = gdbm_fetch(dp->di_dbm, krec);
if ( drec.dptr == 0 ) { if ( drec.dptr == 0 ) {
err_setstr(KeyError, GETSTRINGVALUE((stringobject *)key)); PyErr_SetString(PyExc_KeyError,
PyString_AS_STRING((PyStringObject *)key));
return NULL; return NULL;
} }
v = newsizedstringobject(drec.dptr, drec.dsize); v = PyString_FromStringAndSize(drec.dptr, drec.dsize);
free(drec.dptr); free(drec.dptr);
return v; return v;
} }
@ -136,92 +137,95 @@ dbm_subscript(dp, key)
static int static int
dbm_ass_sub(dp, v, w) dbm_ass_sub(dp, v, w)
dbmobject *dp; dbmobject *dp;
object *v, *w; PyObject *v, *w;
{ {
datum krec, drec; datum krec, drec;
if ( !getargs(v, "s#", &krec.dptr, &krec.dsize) ) { if ( !PyArg_Parse(v, "s#", &krec.dptr, &krec.dsize) ) {
err_setstr(TypeError, "gdbm mappings have string indices only"); PyErr_SetString(PyExc_TypeError,
"gdbm mappings have string indices only");
return -1; return -1;
} }
dp->di_size = -1; dp->di_size = -1;
if (w == NULL) { if (w == NULL) {
if ( gdbm_delete(dp->di_dbm, krec) < 0 ) { if ( gdbm_delete(dp->di_dbm, krec) < 0 ) {
err_setstr(KeyError, GETSTRINGVALUE((stringobject *)v)); PyErr_SetString(PyExc_KeyError,
PyString_AS_STRING((PyStringObject *)v));
return -1; return -1;
} }
} else { } else {
if ( !getargs(w, "s#", &drec.dptr, &drec.dsize) ) { if ( !PyArg_Parse(w, "s#", &drec.dptr, &drec.dsize) ) {
err_setstr(TypeError, PyErr_SetString(PyExc_TypeError,
"gdbm mappings have string elements only"); "gdbm mappings have string elements only");
return -1; return -1;
} }
errno = 0; errno = 0;
if ( gdbm_store(dp->di_dbm, krec, drec, GDBM_REPLACE) < 0 ) { if ( gdbm_store(dp->di_dbm, krec, drec, GDBM_REPLACE) < 0 ) {
if (errno != 0) if (errno != 0)
err_errno(DbmError); PyErr_SetFromErrno(DbmError);
else else
err_setstr(DbmError, (char *) gdbm_strerror(gdbm_errno)); PyErr_SetString(DbmError,
(char *) gdbm_strerror(gdbm_errno));
return -1; return -1;
} }
} }
return 0; return 0;
} }
static mapping_methods dbm_as_mapping = { static PyMappingMethods dbm_as_mapping = {
(inquiry)dbm_length, /*mp_length*/ (inquiry)dbm_length, /*mp_length*/
(binaryfunc)dbm_subscript, /*mp_subscript*/ (binaryfunc)dbm_subscript, /*mp_subscript*/
(objobjargproc)dbm_ass_sub, /*mp_ass_subscript*/ (objobjargproc)dbm_ass_sub, /*mp_ass_subscript*/
}; };
static object * static PyObject *
dbm_close(dp, args) dbm_close(dp, args)
register dbmobject *dp; register dbmobject *dp;
object *args; PyObject *args;
{ {
if ( !getnoarg(args) ) if ( !PyArg_NoArgs(args) )
return NULL; return NULL;
if ( dp->di_dbm ) if ( dp->di_dbm )
gdbm_close(dp->di_dbm); gdbm_close(dp->di_dbm);
dp->di_dbm = NULL; dp->di_dbm = NULL;
INCREF(None); Py_INCREF(Py_None);
return None; return Py_None;
} }
static object * static PyObject *
dbm_keys(dp, args) dbm_keys(dp, args)
register dbmobject *dp; register dbmobject *dp;
object *args; PyObject *args;
{ {
register object *v, *item; register PyObject *v, *item;
datum key, nextkey; datum key, nextkey;
int err; int err;
if (dp == NULL || !is_dbmobject(dp)) { if (dp == NULL || !is_dbmobject(dp)) {
err_badcall(); PyErr_BadInternalCall();
return NULL; return NULL;
} }
if (!getnoarg(args)) if (!PyArg_NoArgs(args))
return NULL; return NULL;
v = newlistobject(0); v = PyList_New(0);
if (v == NULL) if (v == NULL)
return NULL; return NULL;
key = gdbm_firstkey(dp->di_dbm); key = gdbm_firstkey(dp->di_dbm);
while (key.dptr) { while (key.dptr) {
item = newsizedstringobject(key.dptr, key.dsize); item = PyString_FromStringAndSize(key.dptr, key.dsize);
if (item == NULL) { if (item == NULL) {
free(key.dptr); free(key.dptr);
DECREF(v); Py_DECREF(v);
return NULL; return NULL;
} }
err = addlistitem(v, item); err = PyList_Append(v, item);
DECREF(item); Py_DECREF(item);
if (err != 0) { if (err != 0) {
free(key.dptr); free(key.dptr);
DECREF(v); Py_DECREF(v);
return NULL; return NULL;
} }
nextkey = gdbm_nextkey(dp->di_dbm, key); nextkey = gdbm_nextkey(dp->di_dbm, key);
@ -232,99 +236,100 @@ dbm_keys(dp, args)
return v; return v;
} }
static object * static PyObject *
dbm_has_key(dp, args) dbm_has_key(dp, args)
register dbmobject *dp; register dbmobject *dp;
object *args; PyObject *args;
{ {
datum key; datum key;
if (!getargs(args, "s#", &key.dptr, &key.dsize)) if (!PyArg_Parse(args, "s#", &key.dptr, &key.dsize))
return NULL; return NULL;
return newintobject((long) gdbm_exists(dp->di_dbm, key)); return PyInt_FromLong((long) gdbm_exists(dp->di_dbm, key));
} }
static object * static PyObject *
dbm_firstkey(dp, args) dbm_firstkey(dp, args)
register dbmobject *dp; register dbmobject *dp;
object *args; PyObject *args;
{ {
register object *v; register PyObject *v;
datum key; datum key;
if (!getnoarg(args)) if (!PyArg_NoArgs(args))
return NULL; return NULL;
key = gdbm_firstkey(dp->di_dbm); key = gdbm_firstkey(dp->di_dbm);
if (key.dptr) { if (key.dptr) {
v = newsizedstringobject(key.dptr, key.dsize); v = PyString_FromStringAndSize(key.dptr, key.dsize);
free(key.dptr); free(key.dptr);
return v; return v;
} else { } else {
INCREF(None); Py_INCREF(Py_None);
return None; return Py_None;
} }
} }
static object * static PyObject *
dbm_nextkey(dp, args) dbm_nextkey(dp, args)
register dbmobject *dp; register dbmobject *dp;
object *args; PyObject *args;
{ {
register object *v; register PyObject *v;
datum key, nextkey; datum key, nextkey;
if (!getargs(args, "s#", &key.dptr, &key.dsize)) if (!PyArg_Parse(args, "s#", &key.dptr, &key.dsize))
return NULL; return NULL;
nextkey = gdbm_nextkey(dp->di_dbm, key); nextkey = gdbm_nextkey(dp->di_dbm, key);
if (nextkey.dptr) { if (nextkey.dptr) {
v = newsizedstringobject(nextkey.dptr, nextkey.dsize); v = PyString_FromStringAndSize(nextkey.dptr, nextkey.dsize);
free(nextkey.dptr); free(nextkey.dptr);
return v; return v;
} else { } else {
INCREF(None); Py_INCREF(Py_None);
return None; return Py_None;
} }
} }
static object * static PyObject *
dbm_reorganize(dp, args) dbm_reorganize(dp, args)
register dbmobject *dp; register dbmobject *dp;
object *args; PyObject *args;
{ {
if (!getnoarg(args)) if (!PyArg_NoArgs(args))
return NULL; return NULL;
errno = 0; errno = 0;
if (gdbm_reorganize(dp->di_dbm) < 0) { if (gdbm_reorganize(dp->di_dbm) < 0) {
if (errno != 0) if (errno != 0)
err_errno(DbmError); PyErr_SetFromErrno(DbmError);
else else
err_setstr(DbmError, (char *) gdbm_strerror(gdbm_errno)); PyErr_SetString(DbmError,
(char *) gdbm_strerror(gdbm_errno));
return NULL; return NULL;
} }
INCREF(None); Py_INCREF(Py_None);
return None; return Py_None;
} }
static struct methodlist dbm_methods[] = { static PyMethodDef dbm_methods[] = {
{"close", (method)dbm_close}, {"close", (PyCFunction)dbm_close},
{"keys", (method)dbm_keys}, {"keys", (PyCFunction)dbm_keys},
{"has_key", (method)dbm_has_key}, {"has_key", (PyCFunction)dbm_has_key},
{"firstkey", (method)dbm_firstkey}, {"firstkey", (PyCFunction)dbm_firstkey},
{"nextkey", (method)dbm_nextkey}, {"nextkey", (PyCFunction)dbm_nextkey},
{"reorganize", (method)dbm_reorganize}, {"reorganize", (PyCFunction)dbm_reorganize},
{NULL, NULL} /* sentinel */ {NULL, NULL} /* sentinel */
}; };
static object * static PyObject *
dbm_getattr(dp, name) dbm_getattr(dp, name)
dbmobject *dp; dbmobject *dp;
char *name; char *name;
{ {
return findmethod(dbm_methods, (object *)dp, name); return Py_FindMethod(dbm_methods, (PyObject *)dp, name);
} }
static typeobject Dbmtype = { static PyTypeObject Dbmtype = {
OB_HEAD_INIT(&Typetype) PyObject_HEAD_INIT(&PyType_Type)
0, 0,
"gdbm", "gdbm",
sizeof(dbmobject), sizeof(dbmobject),
@ -342,10 +347,10 @@ static typeobject Dbmtype = {
/* ----------------------------------------------------------------- */ /* ----------------------------------------------------------------- */
static object * static PyObject *
dbmopen(self, args) dbmopen(self, args)
object *self; PyObject *self;
object *args; PyObject *args;
{ {
char *name; char *name;
char *flags = "r "; char *flags = "r ";
@ -353,7 +358,7 @@ dbmopen(self, args)
int mode = 0666; int mode = 0666;
/* XXXX add other flags. 2nd character can be "f" meaning open in fast mode. */ /* XXXX add other flags. 2nd character can be "f" meaning open in fast mode. */
if ( !newgetargs(args, "s|si", &name, &flags, &mode) ) if ( !PyArg_ParseTuple(args, "s|si", &name, &flags, &mode) )
return NULL; return NULL;
switch (flags[0]) { switch (flags[0]) {
case 'r': case 'r':
@ -369,7 +374,7 @@ dbmopen(self, args)
iflags = GDBM_NEWDB; iflags = GDBM_NEWDB;
break; break;
default: default:
err_setstr(DbmError, PyErr_SetString(DbmError,
"Flags should be one of 'r', 'w', 'c' or 'n'"); "Flags should be one of 'r', 'w', 'c' or 'n'");
return NULL; return NULL;
} }
@ -378,18 +383,18 @@ dbmopen(self, args)
return newdbmobject(name, iflags, mode); return newdbmobject(name, iflags, mode);
} }
static struct methodlist dbmmodule_methods[] = { static PyMethodDef dbmmodule_methods[] = {
{ "open", (method)dbmopen, 1 }, { "open", (PyCFunction)dbmopen, 1 },
{ 0, 0 }, { 0, 0 },
}; };
void void
initgdbm() { initgdbm() {
object *m, *d; PyObject *m, *d;
m = initmodule("gdbm", dbmmodule_methods); m = Py_InitModule("gdbm", dbmmodule_methods);
d = getmoduledict(m); d = PyModule_GetDict(m);
DbmError = newstringobject("gdbm.error"); DbmError = PyString_FromString("gdbm.error");
if ( DbmError == NULL || dictinsert(d, "error", DbmError) ) if ( DbmError == NULL || PyDict_SetItemString(d, "error", DbmError) )
fatal("can't define gdbm.error"); Py_FatalError("can't define gdbm.error");
} }