diff options
| author | jbj <devnull@localhost> | 2003-12-15 21:42:09 +0000 |
|---|---|---|
| committer | jbj <devnull@localhost> | 2003-12-15 21:42:09 +0000 |
| commit | 8960e3895f7af91126465368dff8fbb36ab4e853 (patch) | |
| tree | 3c515e39dde0e88edeb806ea87d08524ba25c761 /db/btree/bt_compare.c | |
| parent | 752cac72e220dcad4e6fce39508e714e59e3e0a1 (diff) | |
| download | librpm-tizen-8960e3895f7af91126465368dff8fbb36ab4e853.tar.gz librpm-tizen-8960e3895f7af91126465368dff8fbb36ab4e853.tar.bz2 librpm-tizen-8960e3895f7af91126465368dff8fbb36ab4e853.zip | |
- upgrade to db-4.2.52.
CVS patchset: 6972
CVS date: 2003/12/15 21:42:09
Diffstat (limited to 'db/btree/bt_compare.c')
| -rw-r--r-- | db/btree/bt_compare.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/db/btree/bt_compare.c b/db/btree/bt_compare.c index 91481c313..a329d8044 100644 --- a/db/btree/bt_compare.c +++ b/db/btree/bt_compare.c @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 1996, 1997, 1998, 1999, 2000 + * Copyright (c) 1996-2003 * Sleepycat Software. All rights reserved. */ /* @@ -43,7 +43,7 @@ #include "db_config.h" #ifndef lint -static const char revid[] = "$Id: bt_compare.c,v 11.12 2000/10/26 19:00:28 krinsky Exp $"; +static const char revid[] = "$Id: bt_compare.c,v 11.18 2003/01/08 04:00:56 bostic Exp $"; #endif /* not lint */ #ifndef NO_SYSTEM_INCLUDES @@ -51,8 +51,8 @@ static const char revid[] = "$Id: bt_compare.c,v 11.12 2000/10/26 19:00:28 krins #endif #include "db_int.h" -#include "db_page.h" -#include "btree.h" +#include "dbinc/db_page.h" +#include "dbinc/btree.h" /* * __bam_cmp -- @@ -92,7 +92,7 @@ __bam_cmp(dbp, dbt, h, indx, func, cmpp) case P_LBTREE: case P_LDUP: case P_LRECNO: - bk = GET_BKEYDATA(h, indx); + bk = GET_BKEYDATA(dbp, h, indx); if (B_TYPE(bk->type) == B_OVERFLOW) bo = (BOVERFLOW *)bk; else { @@ -125,7 +125,7 @@ __bam_cmp(dbp, dbt, h, indx, func, cmpp) return (0); } - bi = GET_BINTERNAL(h, indx); + bi = GET_BINTERNAL(dbp, h, indx); if (B_TYPE(bi->type) == B_OVERFLOW) bo = (BOVERFLOW *)(bi->data); else { @@ -136,7 +136,7 @@ __bam_cmp(dbp, dbt, h, indx, func, cmpp) } break; default: - return (__db_pgfmt(dbp, PGNO(h))); + return (__db_pgfmt(dbp->dbenv, PGNO(h))); } /* |