[Darwinfiles-cvs] packagetree/sys-libs/db/files db.1.85.patch,NONE,1.1 digest-db-1.85-r1,NONE,1.1 digest-db-3.2.3h-r4,NONE,1.1 digest-db-3.2.9,NONE,1.1 digest-db-3.2.9-r1,NONE,1.1 digest-db-3.3.11,NONE,1.1 digest-db-4.0.14,NONE,1.1 patch.3.2.9.1,NONE,1.1 patch.3.2.9.2,NONE,1.1

[<ji...@us...>]

Update of /cvsroot/darwinfiles/packagetree/sys-libs/db/files
In directory usw-pr-cvs1:/tmp/cvs-serv9308

Added Files:
	db.1.85.patch digest-db-1.85-r1 digest-db-3.2.3h-r4 
	digest-db-3.2.9 digest-db-3.2.9-r1 digest-db-3.3.11 
	digest-db-4.0.14 patch.3.2.9.1 patch.3.2.9.2 
Log Message:
Importing db

--- NEW FILE: db.1.85.patch ---
--- db.1.85/btree/bt_delete.c.jj	Thu Jul 28 16:30:03 1994
+++ db.1.85/btree/bt_delete.c	Wed Apr 19 17:56:12 2000
@@ -154,7 +154,7 @@ __bt_stkacq(t, hp, c)
 	pgno_t pgno;
 	recno_t nextpg, prevpg;
 	int exact, level;
-	
+
 	/*
 	 * Find the first occurrence of the key in the tree.  Toss the
 	 * currently locked page so we don't hit an already-locked page.
@@ -270,7 +270,7 @@ __bt_stkacq(t, hp, c)
 		if ((h = mpool_get(t->bt_mp, prevpg, 0)) == NULL)
 			return (1);
 	}
-	
+
 
 ret:	mpool_put(t->bt_mp, h, 0);
[...1757 lines suppressed...]
-		(*hash) __P((const void *, size_t));
+		(*hash) __PMT((const void *, size_t));
 	int	lorder;		/* byte order */
 } HASHINFO;
 
@@ -224,6 +224,7 @@ typedef struct {
 #endif
 
 __BEGIN_DECLS
+DB *__dbopen __P((const char *, int, int, DBTYPE, const void *));
 DB *dbopen __P((const char *, int, int, DBTYPE, const void *));
 
 #ifdef __DBINTERFACE_PRIVATE
@@ -233,4 +234,5 @@ DB	*__rec_open __P((const char *, int, i
 void	 __dbpanic __P((DB *dbp));
 #endif
 __END_DECLS
-#endif /* !_DB_H_ */
+
+#endif /* db.h */

--- NEW FILE: digest-db-1.85-r1 ---
MD5 42cc6c1e1e25818bd3e3f91328edb0f1 db.1.85.tar.gz 270953

--- NEW FILE: digest-db-3.2.3h-r4 ---
MD5 7a4a88daa29268eebb57ff2ed58dff53 db-3.2.3h.tar.gz 2074615

--- NEW FILE: digest-db-3.2.9 ---
MD5 4df5c7051b11411e0a970f6c91613942 db-3.2.9.tar.gz 2085238

--- NEW FILE: digest-db-3.2.9-r1 ---
MD5 4df5c7051b11411e0a970f6c91613942 db-3.2.9.tar.gz 2085238

--- NEW FILE: digest-db-3.3.11 ---
MD5 b6ae24fa55713f17a9ac3219d987722c db-3.3.11.tar.gz 2343243

--- NEW FILE: digest-db-4.0.14 ---
MD5 12262c64fcd64b772e7cffad8e4d0ebc db-4.0.14.tar.gz 2701799

--- NEW FILE: patch.3.2.9.1 ---
*** include/log.h.orig	2001/01/25 18:22:51	11.20
--- include/log.h	2001/02/06 05:02:28	11.21
***************
*** 198,203 ****
--- 198,204 ----
   */
  typedef enum {
  	DB_LV_INCOMPLETE,
+ 	DB_LV_NONEXISTENT,
  	DB_LV_NORMAL,
  	DB_LV_OLD_READABLE,
  	DB_LV_OLD_UNREADABLE
*** log/log.c.orig	2001/01/25 18:22:55	11.43
--- log/log.c	2001/02/06 05:02:28	11.44
***************
*** 309,321 ****
  	int find_first, *valp;
  	logfile_validity *statusp;
  {
! 	logfile_validity clv_status, status;
  	u_int32_t clv, logval;
  	int cnt, fcnt, ret;
  	const char *dir;
  	char **names, *p, *q, savech;
  
! 	clv_status = status = DB_LV_NORMAL;
  
  	/* Return a value of 0 as the log file number on failure. */
  	*valp = 0;
--- 309,321 ----
  	int find_first, *valp;
  	logfile_validity *statusp;
  {
! 	logfile_validity logval_status, status;
  	u_int32_t clv, logval;
  	int cnt, fcnt, ret;
  	const char *dir;
  	char **names, *p, *q, savech;
  
! 	logval_status = status = DB_LV_NONEXISTENT;
  
  	/* Return a value of 0 as the log file number on failure. */
  	*valp = 0;
***************
*** 385,394 ****
  			 * as a valid log file.
  			 */
  			break;
  		case DB_LV_NORMAL:
  		case DB_LV_OLD_READABLE:
  			logval = clv;
! 			clv_status = status;
  			break;
  		case DB_LV_OLD_UNREADABLE:
  			/*
--- 385,398 ----
  			 * as a valid log file.
  			 */
  			break;
+ 		case DB_LV_NONEXISTENT:
+ 			/* Should never happen. */
+ 			DB_ASSERT(0);
+ 			break;
  		case DB_LV_NORMAL:
  		case DB_LV_OLD_READABLE:
  			logval = clv;
! 			logval_status = status;
  			break;
  		case DB_LV_OLD_UNREADABLE:
  			/*
***************
*** 410,416 ****
  			 */
  			if (!find_first) {
  				logval = clv;
! 				clv_status = status;
  			}
  			break;
  		}
--- 414,420 ----
  			 */
  			if (!find_first) {
  				logval = clv;
! 				logval_status = status;
  			}
  			break;
  		}
***************
*** 420,426 ****
  
  err:	__os_dirfree(names, fcnt);
  	__os_freestr(p);
! 	*statusp = clv_status;
  
  	return (ret);
  }
--- 424,430 ----
  
  err:	__os_dirfree(names, fcnt);
  	__os_freestr(p);
! 	*statusp = logval_status;
  
  	return (ret);
  }

--- NEW FILE: patch.3.2.9.2 ---
*** log/log_rec.c.orig	2001/01/25 18:22:56	11.49
--- log/log_rec.c	2001/02/07 22:17:46
***************
*** 404,410 ****
  				TAILQ_INIT(&logp->dbentry[i].dblist);
  			else
  				TAILQ_REINSERT_HEAD(
! 				    &logp->dbentry[i].dblist, dbp, links);
  		}
  
  		/* Initialize the new entries. */
--- 404,410 ----
  				TAILQ_INIT(&logp->dbentry[i].dblist);
  			else
  				TAILQ_REINSERT_HEAD(
! 				    &logp->dbentry[i].dblist, dbtmp, links);
  		}
  
  		/* Initialize the new entries. */