1-
21/* Berkeley DB interface.
32 Author: Michael McLay
43 Hacked: Guido van Rossum
@@ -42,14 +41,16 @@ staticforward PyTypeObject Bsddbtype;
4241
4342#define is_bsddbobject (v ) ((v)->ob_type == &Bsddbtype)
4443#define check_bsddbobject_open (v ) if ((v)->di_bsddb == NULL) \
45- { PyErr_SetString(BsddbError, "BSDDB object has already been closed"); \
44+ { PyErr_SetString(BsddbError, \
45+ "BSDDB object has already been closed"); \
4646 return NULL; }
4747
4848static PyObject * BsddbError ;
4949
5050static PyObject *
5151newdbhashobject (char * file , int flags , int mode ,
52- int bsize , int ffactor , int nelem , int cachesize , int hash , int lorder )
52+ int bsize , int ffactor , int nelem , int cachesize ,
53+ int hash , int lorder )
5354{
5455 bsddbobject * dp ;
5556 HASHINFO info ;
@@ -94,7 +95,8 @@ newdbhashobject(char *file, int flags, int mode,
9495
9596static PyObject *
9697newdbbtobject (char * file , int flags , int mode ,
97- int btflags , int cachesize , int maxkeypage , int minkeypage , int psize , int lorder )
98+ int btflags , int cachesize , int maxkeypage ,
99+ int minkeypage , int psize , int lorder )
98100{
99101 bsddbobject * dp ;
100102 BTREEINFO info ;
@@ -141,7 +143,8 @@ newdbbtobject(char *file, int flags, int mode,
141143
142144static PyObject *
143145newdbrnobject (char * file , int flags , int mode ,
144- int rnflags , int cachesize , int psize , int lorder , size_t reclen , u_char bval , char * bfname )
146+ int rnflags , int cachesize , int psize , int lorder ,
147+ size_t reclen , u_char bval , char * bfname )
145148{
146149 bsddbobject * dp ;
147150 RECNOINFO info ;
@@ -210,8 +213,10 @@ bsddb_dealloc(bsddbobject *dp)
210213}
211214
212215#ifdef WITH_THREAD
213- #define BSDDB_BGN_SAVE (_dp ) Py_BEGIN_ALLOW_THREADS PyThread_acquire_lock(_dp->di_lock,1);
214- #define BSDDB_END_SAVE (_dp ) PyThread_release_lock(_dp->di_lock); Py_END_ALLOW_THREADS
216+ #define BSDDB_BGN_SAVE (_dp ) \
217+ Py_BEGIN_ALLOW_THREADS PyThread_acquire_lock(_dp->di_lock,1);
218+ #define BSDDB_END_SAVE (_dp ) \
219+ PyThread_release_lock(_dp->di_lock); Py_END_ALLOW_THREADS
215220#else
216221#define BSDDB_BGN_SAVE (_dp ) Py_BEGIN_ALLOW_THREADS
217222#define BSDDB_END_SAVE (_dp ) Py_END_ALLOW_THREADS
@@ -221,7 +226,8 @@ static int
221226bsddb_length (bsddbobject * dp )
222227{
223228 if (dp -> di_bsddb == NULL ) {
224- PyErr_SetString (BsddbError , "BSDDB object has already been closed" );
229+ PyErr_SetString (BsddbError ,
230+ "BSDDB object has already been closed" );
225231 return -1 ;
226232 }
227233 if (dp -> di_size < 0 ) {
@@ -297,7 +303,8 @@ bsddb_ass_sub(bsddbobject *dp, PyObject *key, PyObject *value)
297303 return -1 ;
298304 }
299305 if (dp -> di_bsddb == NULL ) {
300- PyErr_SetString (BsddbError , "BSDDB object has already been closed" );
306+ PyErr_SetString (BsddbError ,
307+ "BSDDB object has already been closed" );
301308 return -1 ;
302309 }
303310 krec .data = data ;
@@ -406,14 +413,17 @@ bsddb_keys(bsddbobject *dp, PyObject *args)
406413 return NULL ;
407414 }
408415 BSDDB_BGN_SAVE (dp )
409- status = (dp -> di_bsddb -> seq )(dp -> di_bsddb , & krec , & drec , R_NEXT );
416+ status = (dp -> di_bsddb -> seq )
417+ (dp -> di_bsddb , & krec , & drec , R_NEXT );
410418 if (status == 0 ) {
411- if (krec .size > sizeof (buf )) data = malloc (krec .size );
419+ if (krec .size > sizeof (buf ))
420+ data = malloc (krec .size );
412421 else data = buf ;
413- if (data != NULL ) memcpy (data ,krec .data ,krec .size );
422+ if (data != NULL )
423+ memcpy (data ,krec .data ,krec .size );
414424 }
415425 BSDDB_END_SAVE (dp )
416- if (data == NULL) return PyErr_NoMemory ();
426+ if (data == NULL) return PyErr_NoMemory ();
417427 }
418428 if (status < 0 ) {
419429 PyErr_SetFromErrno (BsddbError );
0 commit comments