 @@ -1,14 +1,14 @@
-/*	$NetBSD: bt_seq.c,v 1.1 2008/10/10 00:21:43 joerg Exp $	*/
+/*	$NetBSD: bt_seq.c,v 1.2 2013/09/08 12:02:03 ryoon Exp $	*/
 /*	NetBSD: bt_seq.c,v 1.17 2008/09/11 12:58:00 joerg Exp 	*/
 /*-
  * Copyright (c) 1990, 1993, 1994
  *	The Regents of the University of California.  All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * Mike Olson.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
 @@ -26,27 +26,27 @@
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 #include <nbcompat.h>
 #include <nbcompat/cdefs.h>
-__RCSID("$NetBSD: bt_seq.c,v 1.1 2008/10/10 00:21:43 joerg Exp $");
+__RCSID("$NetBSD: bt_seq.c,v 1.2 2013/09/08 12:02:03 ryoon Exp $");
 #include <sys/types.h>
 #include <assert.h>
 #include <errno.h>
 #include <stddef.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <nbcompat/db.h>
 #include "btree.h"
 static int __bt_first(BTREE *, const DBT *, EPG *, int *);
 @@ -80,27 +80,27 @@ __bt_seq(const DB *dbp, DBT *key, DBT *d
 	BTREE *t;
 	EPG e;
 	int status;
 	t = dbp->internal;
 	/* Toss any page pinned across calls. */
 	if (t->bt_pinned != NULL) {
 		mpool_put(t->bt_mp, t->bt_pinned, 0);
 		t->bt_pinned = NULL;
+	}
 	/*
-	 * If scan unitialized as yet, or starting at a specific record, set
+	 * If scan uninitialized as yet, or starting at a specific record, set
 	 * the scan to a specific key.  Both __bt_seqset and __bt_seqadv pin
 	 * the page the cursor references if they're successful.
 	 */
 	switch (flags) {
 	case R_NEXT:
 	case R_PREV:
 		if (F_ISSET(&t->bt_cursor, CURS_INIT)) {
 			status = __bt_seqadv(t, &e, (int)flags);
 			break;
+		}
 		/* FALLTHROUGH */
 	case R_FIRST:
 	case R_LAST:

 @@ -1,14 +1,14 @@
-/*	$NetBSD: bt_utils.c,v 1.1 2008/10/10 00:21:43 joerg Exp $	*/
+/*	$NetBSD: bt_utils.c,v 1.2 2013/09/08 12:02:03 ryoon Exp $	*/
 /*	NetBSD: bt_utils.c,v 1.13 2008/09/10 17:52:35 joerg Exp 	*/
 /*-
  * Copyright (c) 1990, 1993, 1994
  *	The Regents of the University of California.  All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * Mike Olson.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
 @@ -26,27 +26,27 @@
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 #include <nbcompat.h>
 #include <nbcompat/cdefs.h>
-__RCSID("$NetBSD: bt_utils.c,v 1.1 2008/10/10 00:21:43 joerg Exp $");
+__RCSID("$NetBSD: bt_utils.c,v 1.2 2013/09/08 12:02:03 ryoon Exp $");
 #include <sys/param.h>
 #include <assert.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <nbcompat/db.h>
 #include "btree.h"
 /*
  * __bt_ret --
 @@ -63,27 +63,27 @@ __RCSID("$NetBSD: bt_utils.c,v 1.1 2008/
+ *
  * Returns:
  *	RET_SUCCESS, RET_ERROR.
  */
 int
 __bt_ret(BTREE *t, EPG *e, DBT *key, DBT *rkey, DBT *data, DBT *rdata, int copy)
+{
 	BLEAF *bl;
 	void *p;
 	bl = GETBLEAF(e->page, e->index);
 	/*
-	 * We must copy big keys/data to make them contigous.  Otherwise,
+	 * We must copy big keys/data to make them contiguous.  Otherwise,
 	 * leave the page pinned and don't copy unless the user specified
 	 * concurrent access.
 	 */
 	if (key == NULL)
 		goto dataonly;
 	if (bl->flags & P_BIGKEY) {
 		if (__ovfl_get(t, bl->bytes,
 		    &key->size, &rkey->data, &rkey->size))
 			return (RET_ERROR);
 		key->data = rkey->data;
 	} else if (copy || F_ISSET(t, B_DB_LOCK)) {
 		if (bl->ksize > rkey->size) {

 @@ -1,14 +1,14 @@
-/*	$NetBSD: btree.h,v 1.3 2008/10/28 15:06:26 joerg Exp $	*/
+/*	$NetBSD: btree.h,v 1.4 2013/09/08 12:02:03 ryoon Exp $	*/
 /*	NetBSD: btree.h,v 1.16 2008/08/26 21:18:38 joerg Exp 	*/
 /*-
  * Copyright (c) 1991, 1993, 1994
  *	The Regents of the University of California.  All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * Mike Olson.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
 @@ -176,27 +176,27 @@ NBINTERNAL(uint32_t len) {
 typedef struct _rinternal {
 	recno_t	nrecs;			/* number of records */
 	pgno_t	pgno;			/* page number stored below */
 } RINTERNAL;
 /* Get the page's RINTERNAL structure at index indx. */
 #define	GETRINTERNAL(pg, indx)						\
 	((RINTERNAL *)(void *)((char *)(void *)(pg) + (pg)->linp[indx]))
 /* Get the number of bytes in the entry. */
 #define NRINTERNAL							\
 	BTLALIGN(sizeof(recno_t) + sizeof(pgno_t))
-/* Copy a RINTERAL entry to the page. */
+/* Copy a RINTERNAL entry to the page. */
 #define	WR_RINTERNAL(p, nrecs, pgno) do {				\
 	*(recno_t *)(void *)p = nrecs;					\
 	p += sizeof(recno_t);						\
 	*(pgno_t *)(void *)p = pgno;					\
 } while (/*CONSTCOND*/0)
 /* For the btree leaf pages, the item is a key and data pair. */
 typedef struct _bleaf {
 	uint32_t	ksize;		/* size of key */
 	uint32_t	dsize;		/* size of data */
 	uint8_t	flags;			/* P_BIGDATA, P_BIGKEY */
 	char	bytes[1];		/* data */
 } BLEAF;