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

renamed in a grand fashion.

This commit is contained in:
Roger E. Masse 1996-12-10 00:07:00 +00:00
parent 16f9fd2bcf
commit b0dfe969d9
1 changed files with 76 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

134
Modules/dbmmodule.c
View File

@ -32,8 +32,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>
@ -41,18 +40,18 @@ PERFORMANCE OF THIS SOFTWARE.
#include <ndbm.h> #include <ndbm.h>
typedef struct { typedef struct {
OB_HEAD PyObject_HEAD
int di_size; /* -1 means recompute */ int di_size; /* -1 means recompute */
DBM *di_dbm; DBM *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;
@ -60,16 +59,16 @@ newdbmobject(file, flags, 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;
if ( (dp->di_dbm = dbm_open(file, flags, mode)) == 0 ) { if ( (dp->di_dbm = dbm_open(file, flags, mode)) == 0 ) {
err_errno(DbmError); PyErr_SetFromErrno(DbmError);
DECREF(dp); Py_DECREF(dp);
return NULL; return NULL;
} }
return (object *)dp; return (PyObject *)dp;
} }
/* Methods */ /* Methods */
@ -80,7 +79,7 @@ dbm_dealloc(dp)
{ {
if ( dp->di_dbm ) if ( dp->di_dbm )
dbm_close(dp->di_dbm); dbm_close(dp->di_dbm);
DEL(dp); PyMem_DEL(dp);
} }
static int static int
@ -100,148 +99,151 @@ 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;
{ {
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 = dbm_fetch(dp->di_dbm, krec); drec = dbm_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;
} }
if ( dbm_error(dp->di_dbm) ) { if ( dbm_error(dp->di_dbm) ) {
dbm_clearerr(dp->di_dbm); dbm_clearerr(dp->di_dbm);
err_setstr(DbmError, ""); PyErr_SetString(DbmError, "");
return NULL; return NULL;
} }
return newsizedstringobject(drec.dptr, drec.dsize); return PyString_FromStringAndSize(drec.dptr, drec.dsize);
} }
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, "dbm mappings have string indices only"); PyErr_SetString(PyExc_TypeError,
"dbm mappings have string indices only");
return -1; return -1;
} }
dp->di_size = -1; dp->di_size = -1;
if (w == NULL) { if (w == NULL) {
if ( dbm_delete(dp->di_dbm, krec) < 0 ) { if ( dbm_delete(dp->di_dbm, krec) < 0 ) {
dbm_clearerr(dp->di_dbm); dbm_clearerr(dp->di_dbm);
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,
"dbm mappings have string elements only"); "dbm mappings have string elements only");
return -1; return -1;
} }
if ( dbm_store(dp->di_dbm, krec, drec, DBM_REPLACE) < 0 ) { if ( dbm_store(dp->di_dbm, krec, drec, DBM_REPLACE) < 0 ) {
dbm_clearerr(dp->di_dbm); dbm_clearerr(dp->di_dbm);
err_setstr(DbmError, "Cannot add item to database"); PyErr_SetString(DbmError, "Cannot add item to database");
return -1; return -1;
} }
} }
if ( dbm_error(dp->di_dbm) ) { if ( dbm_error(dp->di_dbm) ) {
dbm_clearerr(dp->di_dbm); dbm_clearerr(dp->di_dbm);
err_setstr(DbmError, ""); PyErr_SetString(DbmError, "");
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 )
dbm_close(dp->di_dbm); dbm_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; datum key;
int err; int err;
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;
for (key = dbm_firstkey(dp->di_dbm); key.dptr; for (key = dbm_firstkey(dp->di_dbm); key.dptr;
key = dbm_nextkey(dp->di_dbm)) { key = dbm_nextkey(dp->di_dbm)) {
item = newsizedstringobject(key.dptr, key.dsize); item = PyString_FromStringAndSize(key.dptr, key.dsize);
if (item == NULL) { if (item == NULL) {
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) {
DECREF(v); Py_DECREF(v);
return NULL; return NULL;
} }
} }
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, val; datum key, val;
if (!getargs(args, "s#", &key.dptr, &key.dsize)) if (!PyArg_Parse(args, "s#", &key.dptr, &key.dsize))
return NULL; return NULL;
val = dbm_fetch(dp->di_dbm, key); val = dbm_fetch(dp->di_dbm, key);
return newintobject(val.dptr != NULL); return PyInt_FromLong(val.dptr != NULL);
} }
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},
{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,
"dbm", "dbm",
sizeof(dbmobject), sizeof(dbmobject),
@ -259,17 +261,17 @@ 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";
int iflags; int iflags;
int mode = 0666; int mode = 0666;
if ( !newgetargs(args, "s|si", &name, &flags, &mode) ) if ( !PyArg_ParseTuple(args, "s|si", &name, &flags, &mode) )
return NULL; return NULL;
if ( strcmp(flags, "r") == 0 ) if ( strcmp(flags, "r") == 0 )
iflags = O_RDONLY; iflags = O_RDONLY;
@ -282,25 +284,25 @@ dbmopen(self, args)
else if ( strcmp(flags, "n") == 0 ) else if ( strcmp(flags, "n") == 0 )
iflags = O_RDWR|O_CREAT|O_TRUNC; iflags = O_RDWR|O_CREAT|O_TRUNC;
else { else {
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;
} }
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
initdbm() { initdbm() {
object *m, *d; PyObject *m, *d;
m = initmodule("dbm", dbmmodule_methods); m = Py_InitModule("dbm", dbmmodule_methods);
d = getmoduledict(m); d = PyModule_GetDict(m);
DbmError = newstringobject("dbm.error"); DbmError = PyString_FromString("dbm.error");
if ( DbmError == NULL || dictinsert(d, "error", DbmError) ) if ( DbmError == NULL || PyDict_SetItemString(d, "error", DbmError) )
fatal("can't define dbm.error"); Py_FatalError("can't define dbm.error");
} }