Upgrade to db-4.3.21.

CVS patchset: 7578
CVS date: 2004/11/11 15:58:46

3 files changed, 15 insertions, 15 deletions

diff --git a/db/dbreg/dbreg.c b/db/dbreg/dbreg.c
index 76edd520c..930c8bb7a 100644
--- a/db/dbreg/dbreg.c
+++ b/db/dbreg/dbreg.c
@@ -4,7 +4,7 @@
  * Copyright (c) 1996-2004
  *	Sleepycat Software.  All rights reserved.
  *
- * $Id: dbreg.c,v 11.89 2004/09/22 03:43:09 bostic Exp $
+ * $Id: dbreg.c,v 11.90 2004/10/15 16:59:39 bostic Exp $
  */
 
 #include "db_config.h"
@@ -122,7 +122,7 @@ __dbreg_setup(dbp, name, create_txnid)
 		len = strlen(name) + 1;
 		if ((ret = __db_shalloc(infop, len, 0, &namep)) != 0)
 			goto err;
-		fnp->name_off = R_OFFSET(dbenv, infop, namep);
+		fnp->name_off = R_OFFSET(infop, namep);
 		memcpy(namep, name, len);
 	} else
 		fnp->name_off = INVALID_ROFF;
@@ -182,7 +182,7 @@ __dbreg_teardown(dbp)
 
 	R_LOCK(dbenv, infop);
 	if (fnp->name_off != INVALID_ROFF)
-		__db_shalloc_free(infop, R_ADDR(dbenv, infop, fnp->name_off));
+		__db_shalloc_free(infop, R_ADDR(infop, fnp->name_off));
 	__db_shalloc_free(infop, fnp);
 	R_UNLOCK(dbenv, infop);
 
@@ -283,7 +283,7 @@ __dbreg_get_id(dbp, txn, idp)
 	memset(&fid_dbt, 0, sizeof(fid_dbt));
 	memset(&r_name, 0, sizeof(r_name));
 	if (fnp->name_off != INVALID_ROFF) {
-		r_name.data = R_ADDR(dbenv, &dblp->reginfo, fnp->name_off);
+		r_name.data = R_ADDR(&dblp->reginfo, fnp->name_off);
 		r_name.size = (u_int32_t)strlen((char *)r_name.data) + 1;
 	}
 	fid_dbt.data = dbp->fileid;
@@ -506,7 +506,7 @@ __dbreg_close_id(dbp, txn, op)
 		dbtp = NULL;
 	else {
 		memset(&r_name, 0, sizeof(r_name));
-		r_name.data = R_ADDR(dbenv, &dblp->reginfo, fnp->name_off);
+		r_name.data = R_ADDR(&dblp->reginfo, fnp->name_off);
 		r_name.size =
 		    (u_int32_t)strlen((char *)r_name.data) + 1;
 		dbtp = &r_name;
@@ -555,7 +555,7 @@ __dbreg_push_id(dbenv, id)
 		stack = NULL;
 		DB_ASSERT(lp->free_fids_alloced == 0);
 	} else
-		stack = R_ADDR(dbenv, infop, lp->free_fid_stack);
+		stack = R_ADDR(infop, lp->free_fid_stack);
 
 	/* Check if we have room on the stack. */
 	if (lp->free_fids_alloced <= lp->free_fids + 1) {
@@ -573,7 +573,7 @@ __dbreg_push_id(dbenv, id)
 			__db_shalloc_free(infop, stack);
 		}
 		stack = newstack;
-		lp->free_fid_stack = R_OFFSET(dbenv, infop, stack);
+		lp->free_fid_stack = R_OFFSET(infop, stack);
 		lp->free_fids_alloced += 20;
 		R_UNLOCK(dbenv, infop);
 	}
@@ -596,7 +596,7 @@ __dbreg_pop_id(dbenv, id)
 
 	/* Do we have anything to pop? */
 	if (lp->free_fid_stack != INVALID_ROFF && lp->free_fids > 0) {
-		stack = R_ADDR(dbenv, &dblp->reginfo, lp->free_fid_stack);
+		stack = R_ADDR(&dblp->reginfo, lp->free_fid_stack);
 		*id = stack[--lp->free_fids];
 	} else
 		*id = DB_LOGFILEID_INVALID;
@@ -628,7 +628,7 @@ __dbreg_pluck_id(dbenv, id)
 
 	/* Do we have anything to look at? */
 	if (lp->free_fid_stack != INVALID_ROFF) {
-		stack = R_ADDR(dbenv, &dblp->reginfo, lp->free_fid_stack);
+		stack = R_ADDR(&dblp->reginfo, lp->free_fid_stack);
 		for (i = 0; i < lp->free_fids; i++)
 			if (id == stack[i]) {
 				/*
diff --git a/db/dbreg/dbreg_stat.c b/db/dbreg/dbreg_stat.c
index d033d7ea1..dd53b77c3 100644
--- a/db/dbreg/dbreg_stat.c
+++ b/db/dbreg/dbreg_stat.c
@@ -4,7 +4,7 @@
  * Copyright (c) 1997-2004
  *	Sleepycat Software.  All rights reserved.
  *
- * $Id: dbreg_stat.c,v 11.47 2004/09/22 03:43:09 bostic Exp $
+ * $Id: dbreg_stat.c,v 11.48 2004/10/15 16:59:41 bostic Exp $
  */
 
 #include "db_config.h"
@@ -79,7 +79,7 @@ __dbreg_print_dblist(dbenv, flags)
 		if (fnp->name_off == INVALID_ROFF)
 			name = "";
 		else
-			name = R_ADDR(dbenv, &dblp->reginfo, fnp->name_off);
+			name = R_ADDR(&dblp->reginfo, fnp->name_off);
 
 		dbp = fnp->id >= dblp->dbentry_cnt ? NULL :
 		    dblp->dbentry[fnp->id].dbp;
diff --git a/db/dbreg/dbreg_util.c b/db/dbreg/dbreg_util.c
index c0d36ef17..6f1cc9297 100644
--- a/db/dbreg/dbreg_util.c
+++ b/db/dbreg/dbreg_util.c
@@ -4,7 +4,7 @@
  * Copyright (c) 1997-2004
  *	Sleepycat Software.  All rights reserved.
  *
- * $Id: dbreg_util.c,v 11.49 2004/09/22 03:43:09 bostic Exp $
+ * $Id: dbreg_util.c,v 11.50 2004/10/15 16:59:41 bostic Exp $
  */
 
 #include "db_config.h"
@@ -119,7 +119,7 @@ __dbreg_log_files(dbenv)
 			dbtp = NULL;
 		else {
 			memset(&t, 0, sizeof(t));
-			t.data = R_ADDR(dbenv, &dblp->reginfo, fnp->name_off);
+			t.data = R_ADDR(&dblp->reginfo, fnp->name_off);
 			t.size = (u_int32_t)strlen(t.data) + 1;
 			dbtp = &t;
 		}
@@ -300,7 +300,7 @@ __dbreg_id_to_db_int(dbenv, txn, dbpp, ndx, inc, tryopen)
 		 * assumption, because the other process that has the file
 		 * open shouldn't be closing it while we're trying to abort.
 		 */
-		name = R_ADDR(dbenv, &dblp->reginfo, fname->name_off);
+		name = R_ADDR(&dblp->reginfo, fname->name_off);
 
 		/*
 		 * At this point, we are not holding the thread lock, so exit
@@ -436,7 +436,7 @@ __dbreg_get_name(dbenv, fid, namep)
 	dblp = dbenv->lg_handle;
 
 	if (dblp != NULL && __dbreg_fid_to_fname(dblp, fid, 0, &fnp) == 0) {
-		*namep = R_ADDR(dbenv, &dblp->reginfo, fnp->name_off);
+		*namep = R_ADDR(&dblp->reginfo, fnp->name_off);
 		return (0);
 	}