[Python-checkins] CVS: python/dist/src/Modules bsddbmodule.c,1.21,1.22 dbmmodule.c,2.19,2.20

2000年7月10日 10:06:42 -0700

Update of /cvsroot/python/python/dist/src/Modules
In directory slayer.i.sourceforge.net:/tmp/cvs-serv7771
Modified Files:
	bsddbmodule.c dbmmodule.c 
Log Message:
ANSI-fication, not really tested, but should (hopefully) compile
Index: bsddbmodule.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/bsddbmodule.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -r1.21 -r1.22
*** bsddbmodule.c	2000年06月30日 23:58:05	1.21
--- bsddbmodule.c	2000年07月10日 17:06:38	1.22
***************
*** 55,69 ****

 static PyObject *
! newdbhashobject(file, flags, mode,
! 		bsize, ffactor, nelem, cachesize, hash, lorder)
! 	char *file;
! int flags;
! int mode;
! int bsize;
! int ffactor;
! int nelem;
! int cachesize;
! int hash; /* XXX ignored */
! int lorder;
 {
 	bsddbobject *dp;
--- 55,60 ----

 static PyObject *
! newdbhashobject(char *file, int flags, int mode,
! 		int bsize, int ffactor, int nelem, int cachesize, int hash, int lorder)
 {
 	bsddbobject *dp;
***************
*** 109,123 ****

 static PyObject *
! newdbbtobject(file, flags, mode,
! 	 btflags, cachesize, maxkeypage, minkeypage, psize, lorder)
! 	char *file;
! int flags;
! int mode;
! int btflags;
! int cachesize;
! int maxkeypage;
! int minkeypage;
! int psize;
! int lorder;
 {
 	bsddbobject *dp;
--- 100,105 ----

 static PyObject *
! newdbbtobject(char *file, int flags, int mode,
! 	 int btflags, int cachesize, int maxkeypage, int minkeypage, int psize, int lorder)
 {
 	bsddbobject *dp;
***************
*** 165,180 ****

 static PyObject *
! newdbrnobject(file, flags, mode,
! 	 rnflags, cachesize, psize, lorder, reclen, bval, bfname)
! 	char *file;
! int flags;
! int mode;
! int rnflags;
! int cachesize;
! int psize;
! int lorder;
! size_t reclen;
! u_char bval;
! char *bfname;
 {
 	bsddbobject *dp;
--- 147,152 ----

 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;
***************
*** 221,226 ****

 static void
! bsddb_dealloc(dp)
! 	bsddbobject *dp;
 {
 #ifdef WITH_THREAD
--- 193,197 ----

 static void
! bsddb_dealloc(bsddbobject *dp)
 {
 #ifdef WITH_THREAD
***************
*** 254,259 ****

 static int
! bsddb_length(dp)
! 	bsddbobject *dp;
 {
 if (dp->di_bsddb == NULL) {
--- 225,229 ----

 static int
! bsddb_length(bsddbobject *dp)
 {
 if (dp->di_bsddb == NULL) {
***************
*** 283,289 ****

 static PyObject *
! bsddb_subscript(dp, key)
! 	bsddbobject *dp;
! PyObject *key;
 {
 	int status;
--- 253,257 ----

 static PyObject *
! bsddb_subscript(bsddbobject *dp, PyObject *key)
 {
 	int status;
***************
*** 322,328 ****

 static int
! bsddb_ass_sub(dp, key, value)
! 	bsddbobject *dp;
! PyObject *key, *value;
 {
 	int status;
--- 290,294 ----

 static int
! bsddb_ass_sub(bsddbobject *dp, PyObject *key, PyObject *value)
 {
 	int status;
***************
*** 388,394 ****

 static PyObject *
! bsddb_close(dp, args)
! 	bsddbobject *dp;
! PyObject *args;
 {
 	if (!PyArg_NoArgs(args))
--- 354,358 ----

 static PyObject *
! bsddb_close(bsddbobject *dp, PyObject *args)
 {
 	if (!PyArg_NoArgs(args))
***************
*** 411,417 ****

 static PyObject *
! bsddb_keys(dp, args)
! 	bsddbobject *dp;
! PyObject *args;
 {
 	PyObject *list, *item;
--- 375,379 ----

 static PyObject *
! bsddb_keys(bsddbobject *dp, PyObject *args)
 {
 	PyObject *list, *item;
***************
*** 468,474 ****

 static PyObject *
! bsddb_has_key(dp, args)
! 	bsddbobject *dp;
! PyObject *args;
 {
 	DBT krec, drec;
--- 430,434 ----

 static PyObject *
! bsddb_has_key(bsddbobject *dp, PyObject *args)
 {
 	DBT krec, drec;
***************
*** 495,501 ****

 static PyObject *
! bsddb_set_location(dp, key)
! 	bsddbobject *dp;
! PyObject *key;
 {
 	int status;
--- 455,459 ----

 static PyObject *
! bsddb_set_location(bsddbobject *dp, PyObject *key)
 {
 	int status;
***************
*** 533,540 ****

 static PyObject *
! bsddb_seq(dp, args, sequence_request)
! 	bsddbobject *dp;
! PyObject *args;
! int sequence_request;
 {
 	int status;
--- 491,495 ----

 static PyObject *
! bsddb_seq(bsddbobject *dp, PyObject *args, int sequence_request)
 {
 	int status;
***************
*** 578,612 ****

 static PyObject *
! bsddb_next(dp, key)
! 	bsddbobject *dp;
! PyObject *key;
 {
 	return bsddb_seq(dp, key, R_NEXT);
 }
 static PyObject *
! bsddb_previous(dp, key)
! 	bsddbobject *dp;
! PyObject *key;
 {
 	return bsddb_seq(dp, key, R_PREV);
 }
 static PyObject *
! bsddb_first(dp, key)
! 	bsddbobject *dp;
! PyObject *key;
 {
 	return bsddb_seq(dp, key, R_FIRST);
 }
 static PyObject *
! bsddb_last(dp, key)
! 	bsddbobject *dp;
! PyObject *key;
 {
 	return bsddb_seq(dp, key, R_LAST);
 }
 static PyObject *
! bsddb_sync(dp, args)
! 	bsddbobject *dp;
! PyObject *args;
 {
 	int status;
--- 533,557 ----

 static PyObject *
! bsddb_next(bsddbobject *dp, PyObject *key)
 {
 	return bsddb_seq(dp, key, R_NEXT);
 }
 static PyObject *
! bsddb_previous(bsddbobject *dp, PyObject *key)
 {
 	return bsddb_seq(dp, key, R_PREV);
 }
 static PyObject *
! bsddb_first(bsddbobject *dp, PyObject *key)
 {
 	return bsddb_seq(dp, key, R_FIRST);
 }
 static PyObject *
! bsddb_last(bsddbobject *dp, PyObject *key)
 {
 	return bsddb_seq(dp, key, R_LAST);
 }
 static PyObject *
! bsddb_sync(bsddbobject *dp, PyObject *args)
 {
 	int status;
***************
*** 638,644 ****

 static PyObject *
! bsddb_getattr(dp, name)
! 	PyObject *dp;
! char *name;
 {
 	return Py_FindMethod(bsddb_methods, dp, name);
--- 583,587 ----

 static PyObject *
! bsddb_getattr(PyObject *dp, char *name)
 {
 	return Py_FindMethod(bsddb_methods, dp, name);
***************
*** 663,669 ****

 static PyObject *
! bsdhashopen(self, args)
! 	PyObject *self;
! PyObject *args;
 {
 	char *file;
--- 606,610 ----

 static PyObject *
! bsdhashopen(PyObject *self, PyObject *args)
 {
 	char *file;
***************
*** 716,722 ****

 static PyObject *
! bsdbtopen(self, args)
! 	PyObject *self;
! PyObject *args;
 {
 	char *file;
--- 657,661 ----

 static PyObject *
! bsdbtopen(PyObject *self, PyObject *args)
 {
 	char *file;
***************
*** 770,776 ****

 static PyObject *
! bsdrnopen(self, args)
! 	PyObject *self;
! PyObject *args;
 {
 	char *file;
--- 709,713 ----

 static PyObject *
! bsdrnopen(PyObject *self, PyObject *args)
 {
 	char *file;
Index: dbmmodule.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/dbmmodule.c,v
retrieving revision 2.19
retrieving revision 2.20
diff -C2 -r2.19 -r2.20
*** dbmmodule.c	2000年06月30日 23:58:05	2.19
--- dbmmodule.c	2000年07月10日 17:06:38	2.20
***************
*** 35,42 ****

 static PyObject *
! newdbmobject(file, flags, mode)
! 	char *file;
! int flags;
! int mode;
 {
 dbmobject *dp;
--- 35,39 ----

 static PyObject *
! newdbmobject(char *file, int flags, int mode)
 {
 dbmobject *dp;
***************
*** 57,62 ****

 static void
! dbm_dealloc(dp)
! 	register dbmobject *dp;
 {
 if ( dp->di_dbm )
--- 54,58 ----

 static void
! dbm_dealloc(register dbmobject *dp)
 {
 if ( dp->di_dbm )
***************
*** 66,71 ****

 static int
! dbm_length(dp)
! 	dbmobject *dp;
 {
 if (dp->di_dbm == NULL) {
--- 62,66 ----

 static int
! dbm_length(dbmobject *dp)
 {
 if (dp->di_dbm == NULL) {
***************
*** 87,93 ****

 static PyObject *
! dbm_subscript(dp, key)
! 	dbmobject *dp;
! register PyObject *key;
 {
 	datum drec, krec;
--- 82,86 ----

 static PyObject *
! dbm_subscript(dbmobject *dp, register PyObject *key)
 {
 	datum drec, krec;
***************
*** 112,118 ****

 static int
! dbm_ass_sub(dp, v, w)
! 	dbmobject *dp;
! PyObject *v, *w;
 {
 datum krec, drec;
--- 105,109 ----

 static int
! dbm_ass_sub(dbmobject *dp, PyObject *v, PyObject *w)
 {
 datum krec, drec;
***************
*** 163,169 ****

 static PyObject *
! dbm__close(dp, args)
! 	register dbmobject *dp;
! PyObject *args;
 {
 	if ( !PyArg_NoArgs(args) )
--- 154,158 ----

 static PyObject *
! dbm__close(register dbmobject *dp, PyObject *args)
 {
 	if ( !PyArg_NoArgs(args) )
***************
*** 177,183 ****

 static PyObject *
! dbm_keys(dp, args)
! 	register dbmobject *dp;
! PyObject *args;
 {
 	register PyObject *v, *item;
--- 166,170 ----

 static PyObject *
! dbm_keys(register dbmobject *dp, PyObject *args)
 {
 	register PyObject *v, *item;
***************
*** 209,215 ****

 static PyObject *
! dbm_has_key(dp, args)
! 	register dbmobject *dp;
! PyObject *args;
 {
 	datum key, val;
--- 196,200 ----

 static PyObject *
! dbm_has_key(register dbmobject *dp, PyObject *args)
 {
 	datum key, val;
***************
*** 230,236 ****

 static PyObject *
! dbm_getattr(dp, name)
! 	dbmobject *dp;
! char *name;
 {
 	return Py_FindMethod(dbm_methods, (PyObject *)dp, name);
--- 215,219 ----

 static PyObject *
! dbm_getattr(dbmobject *dp, char *name)
 {
 	return Py_FindMethod(dbm_methods, (PyObject *)dp, name);
***************
*** 257,263 ****

 static PyObject *
! dbmopen(self, args)
! 	PyObject *self;
! PyObject *args;
 {
 	char *name;
--- 240,244 ----

 static PyObject *
! dbmopen(PyObject *self, PyObject *args)
 {
 	char *name;