diff options
| author | pst <pst@FreeBSD.org> | 1996-02-27 19:42:00 +0000 |
|---|---|---|
| committer | pst <pst@FreeBSD.org> | 1996-02-27 19:42:00 +0000 |
| commit | 912836fc11fb14d3f93b1bbd3d937daf0364a21f (patch) | |
| tree | 282ca344758456835717d95b22f07b9d665d2134 /lib/libc/db/recno/rec_search.c | |
| parent | 221f5fcda8cae5ef7821d99fddd45a0d52a012f2 (diff) | |
| download | FreeBSD-src-912836fc11fb14d3f93b1bbd3d937daf0364a21f.zip FreeBSD-src-912836fc11fb14d3f93b1bbd3d937daf0364a21f.tar.gz | |
Fix conflicts and merge into mainline
Diffstat (limited to 'lib/libc/db/recno/rec_search.c')
| -rw-r--r-- | lib/libc/db/recno/rec_search.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/lib/libc/db/recno/rec_search.c b/lib/libc/db/recno/rec_search.c index a1feff8..acc109e 100644 --- a/lib/libc/db/recno/rec_search.c +++ b/lib/libc/db/recno/rec_search.c @@ -32,7 +32,7 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -static char sccsid[] = "@(#)rec_search.c 8.3 (Berkeley) 2/21/94"; +static char sccsid[] = "@(#)rec_search.c 8.4 (Berkeley) 7/14/94"; #endif /* LIBC_SCCS and not lint */ #include <sys/types.h> @@ -91,9 +91,8 @@ __rec_search(t, recno, op) total += r->nrecs; } - if (__bt_push(t, pg, index - 1) == RET_ERROR) - return (NULL); - + BT_PUSH(t, pg, index - 1); + pg = r->pgno; switch (op) { case SDELETE: |
