[Python-checkins] CVS: python/dist/src/Modules bsddbmodule.c,1.26,1.27

[Fred L. Drake]

Update of /cvsroot/python/python/dist/src/Modules
In directory usw-pr-cvs1:/tmp/cvs-serv17558

Modified Files:
	bsddbmodule.c 
Log Message:

Wrap a bunch of long lines.


Index: bsddbmodule.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/bsddbmodule.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -r1.26 -r1.27
*** bsddbmodule.c	2000/12/15 00:59:32	1.26
--- bsddbmodule.c	2001/02/19 21:16:00	1.27
***************
*** 1,3 ****
- 
  /* Berkeley DB interface.
     Author: Michael McLay
--- 1,2 ----
***************
*** 43,47 ****
  #define is_bsddbobject(v) ((v)->ob_type == &Bsddbtype)
  #define check_bsddbobject_open(v) if ((v)->di_bsddb == NULL) \
!                { PyErr_SetString(BsddbError, "BSDDB object has already been closed"); \
                   return NULL; }
  
--- 42,47 ----
  #define is_bsddbobject(v) ((v)->ob_type == &Bsddbtype)
  #define check_bsddbobject_open(v) if ((v)->di_bsddb == NULL) \
!                { PyErr_SetString(BsddbError, \
! 				 "BSDDB object has already been closed"); \
                   return NULL; }
  
***************
*** 50,54 ****
  static PyObject *
  newdbhashobject(char *file, int flags, int mode,
! 		int bsize, int ffactor, int nelem, int cachesize, int hash, int lorder)
  {
  	bsddbobject *dp;
--- 50,55 ----
  static PyObject *
  newdbhashobject(char *file, int flags, int mode,
! 		int bsize, int ffactor, int nelem, int cachesize,
! 		int hash, int lorder)
  {
  	bsddbobject *dp;
***************
*** 95,99 ****
  static PyObject *
  newdbbtobject(char *file, int flags, int mode,
! 	      int btflags, int cachesize, int maxkeypage, int minkeypage, int psize, int lorder)
  {
  	bsddbobject *dp;
--- 96,101 ----
  static PyObject *
  newdbbtobject(char *file, int flags, int mode,
! 	      int btflags, int cachesize, int maxkeypage,
! 	      int minkeypage, int psize, int lorder)
  {
  	bsddbobject *dp;
***************
*** 142,146 ****
  static PyObject *
  newdbrnobject(char *file, int flags, int mode,
! 	      int rnflags, int cachesize, int psize, int lorder, size_t reclen, u_char bval, char *bfname)
  {
  	bsddbobject *dp;
--- 144,149 ----
  static PyObject *
  newdbrnobject(char *file, int flags, int mode,
! 	      int rnflags, int cachesize, int psize, int lorder,
! 	      size_t reclen, u_char bval, char *bfname)
  {
  	bsddbobject *dp;
***************
*** 211,216 ****
  
  #ifdef WITH_THREAD
! #define BSDDB_BGN_SAVE(_dp) Py_BEGIN_ALLOW_THREADS PyThread_acquire_lock(_dp->di_lock,1);
! #define BSDDB_END_SAVE(_dp) PyThread_release_lock(_dp->di_lock); Py_END_ALLOW_THREADS
  #else
  #define BSDDB_BGN_SAVE(_dp) Py_BEGIN_ALLOW_THREADS 
--- 214,221 ----
  
  #ifdef WITH_THREAD
! #define BSDDB_BGN_SAVE(_dp) \
! 	Py_BEGIN_ALLOW_THREADS PyThread_acquire_lock(_dp->di_lock,1);
! #define BSDDB_END_SAVE(_dp) \
! 	PyThread_release_lock(_dp->di_lock); Py_END_ALLOW_THREADS
  #else
  #define BSDDB_BGN_SAVE(_dp) Py_BEGIN_ALLOW_THREADS 
***************
*** 222,226 ****
  {
          if (dp->di_bsddb == NULL) {
!                  PyErr_SetString(BsddbError, "BSDDB object has already been closed"); 
                   return -1; 
          }
--- 227,232 ----
  {
          if (dp->di_bsddb == NULL) {
!                  PyErr_SetString(BsddbError,
! 				 "BSDDB object has already been closed"); 
                   return -1; 
          }
***************
*** 298,302 ****
  	}
          if (dp->di_bsddb == NULL) {
!                  PyErr_SetString(BsddbError, "BSDDB object has already been closed"); 
                   return -1; 
          }
--- 304,309 ----
  	}
          if (dp->di_bsddb == NULL) {
!                  PyErr_SetString(BsddbError,
! 				 "BSDDB object has already been closed"); 
                   return -1; 
          }
***************
*** 407,418 ****
  		}
  		BSDDB_BGN_SAVE(dp)
! 		status = (dp->di_bsddb->seq)(dp->di_bsddb, &krec, &drec, R_NEXT);
  		if (status == 0) {
! 			if (krec.size > sizeof(buf)) data = malloc(krec.size);
  			else data = buf;
! 			if (data!=NULL) memcpy(data,krec.data,krec.size);
  		}
  		BSDDB_END_SAVE(dp)
! 		if (data==NULL) return PyErr_NoMemory();
  	}
  	if (status < 0) {
--- 414,428 ----
  		}
  		BSDDB_BGN_SAVE(dp)
! 		status = (dp->di_bsddb->seq)
! 			(dp->di_bsddb, &krec, &drec, R_NEXT);
  		if (status == 0) {
! 			if (krec.size > sizeof(buf))
! 				data = malloc(krec.size);
  			else data = buf;
! 			if (data != NULL)
! 				memcpy(data,krec.data,krec.size);
  		}
  		BSDDB_END_SAVE(dp)
! 		if (data == NULL) return PyErr_NoMemory();
  	}
  	if (status < 0) {