mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-02 16:13:13 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Reindented via GvR recomendation ala Bwarsaw cppy-style.el

Browse source
This commit is contained in:
Roger E. Masse 1996-12-13 15:55:22 +00:00
parent 8d40c843c1
commit e7ee8c3753
1 changed files with 68 additions and 68 deletions
Download patch file Download diff file Expand all files Collapse all files

136
Modules/dbmmodule.c
View file

@ -53,9 +53,9 @@ static PyObject *DbmError;
static PyObject * 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;
@ -64,9 +64,9 @@ newdbmobject(file, flags, mode)
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 ) {
PyErr_SetFromErrno(DbmError); PyErr_SetFromErrno(DbmError);
Py_DECREF(dp); Py_DECREF(dp);
return NULL; return NULL;
} }
return (PyObject *)dp; return (PyObject *)dp;
} }
@ -78,7 +78,7 @@ dbm_dealloc(dp)
register dbmobject *dp; register dbmobject *dp;
{ {
if ( dp->di_dbm ) if ( dp->di_dbm )
dbm_close(dp->di_dbm); dbm_close(dp->di_dbm);
PyMem_DEL(dp); PyMem_DEL(dp);
} }
@ -87,14 +87,14 @@ dbm_length(dp)
dbmobject *dp; dbmobject *dp;
{ {
if ( dp->di_size < 0 ) { if ( dp->di_size < 0 ) {
datum key; datum key;
int size; int size;
size = 0; size = 0;
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))
size++; size++;
dp->di_size = size; dp->di_size = size;
} }
return dp->di_size; return dp->di_size;
} }
@ -102,7 +102,7 @@ dbm_length(dp)
static PyObject * static PyObject *
dbm_subscript(dp, key) dbm_subscript(dp, key)
dbmobject *dp; dbmobject *dp;
register PyObject *key; register PyObject *key;
{ {
datum drec, krec; datum drec, krec;
@ -111,14 +111,14 @@ dbm_subscript(dp, key)
drec = dbm_fetch(dp->di_dbm, krec); drec = dbm_fetch(dp->di_dbm, krec);
if ( drec.dptr == 0 ) { if ( drec.dptr == 0 ) {
PyErr_SetString(PyExc_KeyError, PyErr_SetString(PyExc_KeyError,
PyString_AS_STRING((PyStringObject *)key)); 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);
PyErr_SetString(DbmError, ""); PyErr_SetString(DbmError, "");
return NULL; return NULL;
} }
return PyString_FromStringAndSize(drec.dptr, drec.dsize); return PyString_FromStringAndSize(drec.dptr, drec.dsize);
} }
@ -126,39 +126,39 @@ dbm_subscript(dp, key)
static int static int
dbm_ass_sub(dp, v, w) dbm_ass_sub(dp, v, w)
dbmobject *dp; dbmobject *dp;
PyObject *v, *w; PyObject *v, *w;
{ {
datum krec, drec; datum krec, drec;
if ( !PyArg_Parse(v, "s#", &krec.dptr, &krec.dsize) ) { if ( !PyArg_Parse(v, "s#", &krec.dptr, &krec.dsize) ) {
PyErr_SetString(PyExc_TypeError, PyErr_SetString(PyExc_TypeError,
"dbm mappings have string indices only"); "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);
PyErr_SetString(PyExc_KeyError, PyErr_SetString(PyExc_KeyError,
PyString_AS_STRING((PyStringObject *)v)); PyString_AS_STRING((PyStringObject *)v));
return -1; return -1;
} }
} else { } else {
if ( !PyArg_Parse(w, "s#", &drec.dptr, &drec.dsize) ) { if ( !PyArg_Parse(w, "s#", &drec.dptr, &drec.dsize) ) {
PyErr_SetString(PyExc_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);
PyErr_SetString(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);
PyErr_SetString(DbmError, ""); PyErr_SetString(DbmError, "");
return -1; return -1;
} }
return 0; return 0;
} }
@ -172,12 +172,12 @@ static PyMappingMethods dbm_as_mapping = {
static PyObject * static PyObject *
dbm__close(dp, args) dbm__close(dp, args)
register dbmobject *dp; register dbmobject *dp;
PyObject *args; PyObject *args;
{ {
if ( !PyArg_NoArgs(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;
Py_INCREF(Py_None); Py_INCREF(Py_None);
return Py_None; return Py_None;
@ -186,7 +186,7 @@ dbm__close(dp, args)
static PyObject * static PyObject *
dbm_keys(dp, args) dbm_keys(dp, args)
register dbmobject *dp; register dbmobject *dp;
PyObject *args; PyObject *args;
{ {
register PyObject *v, *item; register PyObject *v, *item;
datum key; datum key;
@ -217,7 +217,7 @@ dbm_keys(dp, args)
static PyObject * static PyObject *
dbm_has_key(dp, args) dbm_has_key(dp, args)
register dbmobject *dp; register dbmobject *dp;
PyObject *args; PyObject *args;
{ {
datum key, val; datum key, val;
@ -237,7 +237,7 @@ static PyMethodDef dbm_methods[] = {
static PyObject * static PyObject *
dbm_getattr(dp, name) dbm_getattr(dp, name)
dbmobject *dp; dbmobject *dp;
char *name; char *name;
{ {
return Py_FindMethod(dbm_methods, (PyObject *)dp, name); return Py_FindMethod(dbm_methods, (PyObject *)dp, name);
} }
@ -263,8 +263,8 @@ static PyTypeObject Dbmtype = {
static PyObject * static PyObject *
dbmopen(self, args) dbmopen(self, args)
PyObject *self; PyObject *self;
PyObject *args; PyObject *args;
{ {
char *name; char *name;
char *flags = "r"; char *flags = "r";
@ -272,37 +272,37 @@ dbmopen(self, args)
int mode = 0666; int mode = 0666;
if ( !PyArg_ParseTuple(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;
else if ( strcmp(flags, "w") == 0 ) else if ( strcmp(flags, "w") == 0 )
iflags = O_RDWR; iflags = O_RDWR;
else if ( strcmp(flags, "rw") == 0 ) /* B/W compat */ else if ( strcmp(flags, "rw") == 0 ) /* B/W compat */
iflags = O_RDWR|O_CREAT; iflags = O_RDWR|O_CREAT;
else if ( strcmp(flags, "c") == 0 ) else if ( strcmp(flags, "c") == 0 )
iflags = O_RDWR|O_CREAT; iflags = O_RDWR|O_CREAT;
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 {
PyErr_SetString(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 PyMethodDef dbmmodule_methods[] = { static PyMethodDef dbmmodule_methods[] = {
{ "open", (PyCFunction)dbmopen, 1 }, { "open", (PyCFunction)dbmopen, 1 },
{ 0, 0 }, { 0, 0 },
}; };
void void
initdbm() { initdbm() {
PyObject *m, *d; PyObject *m, *d;
m = Py_InitModule("dbm", dbmmodule_methods); m = Py_InitModule("dbm", dbmmodule_methods);
d = PyModule_GetDict(m); d = PyModule_GetDict(m);
DbmError = PyString_FromString("dbm.error"); DbmError = PyString_FromString("dbm.error");
if ( DbmError == NULL || PyDict_SetItemString(d, "error", DbmError) ) if ( DbmError == NULL || PyDict_SetItemString(d, "error", DbmError) )
Py_FatalError("can't define dbm.error"); Py_FatalError("can't define dbm.error");
} }