Update.

	* db2/btree/bt_cursor.c: Likewise.
	* db2/common/db_region.db_c: Likewise.
	* db2/common/db_salloc.db_c: Likewise.
	* db2/db/db.c: Likewise.
	* db2/db/db_rec.c: Likewise.
	* db2/hash/hash.c: Likewise.
	* db2/hash/hash_page.c: Likewise.
	* db2/hash/hash_rec.c: Likewise.
	* db2/log/log_findckp.c: Likewise.
	* db2/log/log_get.c: Likewise.
	* db2/log/log_put.c: Likewise.
	* db2/mp/mp_fget.c: Likewise.
	* db2/mp/mp_fput.c: Likewise.
	* db2/mp/mp_region.c: Likewise.

1 files changed, 20 insertions, 11 deletions

diff --git a/db2/hash/hash_rec.c b/db2/hash/hash_rec.c
index efaf61c638..727f615828 100644
--- a/db2/hash/hash_rec.c
+++ b/db2/hash/hash_rec.c
@@ -93,7 +93,7 @@ __ham_insdel_recover(logp, dbtp, lsnp, redo, info)
 	REC_INTRO(__ham_insdel_read);
 
 	ret = memp_fget(mpf, &argp->pgno, 0, &pagep);
-	if (ret != 0)
+	if (ret != 0) {
 		if (!redo) {
 			/*
 			 * We are undoing and the page doesn't exist.  That
@@ -107,7 +107,7 @@ __ham_insdel_recover(logp, dbtp, lsnp, redo, info)
 		} else if ((ret = memp_fget(mpf, &argp->pgno,
 		    DB_MPOOL_CREATE, &pagep)) != 0)
 			goto out;
-
+	}
 
 	hashp = (HTAB *)file_dbp->internal;
 	GET_META(file_dbp, hashp);
@@ -199,7 +199,7 @@ __ham_newpage_recover(logp, dbtp, lsnp, redo, info)
 	REC_INTRO(__ham_newpage_read);
 
 	ret = memp_fget(mpf, &argp->new_pgno, 0, &pagep);
-	if (ret != 0)
+	if (ret != 0) {
 		if (!redo) {
 			/*
 			 * We are undoing and the page doesn't exist.  That
@@ -212,6 +212,7 @@ __ham_newpage_recover(logp, dbtp, lsnp, redo, info)
 		} else if ((ret = memp_fget(mpf, &argp->new_pgno,
 		    DB_MPOOL_CREATE, &pagep)) != 0)
 			goto out;
+	}
 
 	hashp = (HTAB *)file_dbp->internal;
 	GET_META(file_dbp, hashp);
@@ -255,7 +256,7 @@ __ham_newpage_recover(logp, dbtp, lsnp, redo, info)
 ppage:	if (argp->prev_pgno != PGNO_INVALID) {
 		ret = memp_fget(mpf, &argp->prev_pgno, 0, &pagep);
 
-		if (ret != 0)
+		if (ret != 0) {
 			if (!redo) {
 				/*
 				 * We are undoing and the page doesn't exist.
@@ -269,6 +270,7 @@ ppage:	if (argp->prev_pgno != PGNO_INVALID) {
 			    memp_fget(mpf, &argp->prev_pgno,
 			    DB_MPOOL_CREATE, &pagep)) != 0)
 				goto out;
+		}
 
 		cmp_n = log_compare(lsnp, &LSN(pagep));
 		cmp_p = log_compare(&LSN(pagep), &argp->prevlsn);
@@ -300,7 +302,7 @@ ppage:	if (argp->prev_pgno != PGNO_INVALID) {
 npage:	if (argp->next_pgno != PGNO_INVALID) {
 		ret = memp_fget(mpf, &argp->next_pgno, 0, &pagep);
 
-		if (ret != 0)
+		if (ret != 0) {
 			if (!redo) {
 				/*
 				 * We are undoing and the page doesn't exist.
@@ -315,6 +317,7 @@ npage:	if (argp->next_pgno != PGNO_INVALID) {
 			    memp_fget(mpf, &argp->next_pgno,
 			    DB_MPOOL_CREATE, &pagep)) != 0)
 				goto out;
+		}
 
 		cmp_n = log_compare(lsnp, &LSN(pagep));
 		cmp_p = log_compare(&LSN(pagep), &argp->nextlsn);
@@ -384,7 +387,7 @@ __ham_replace_recover(logp, dbtp, lsnp, redo, info)
 	REC_INTRO(__ham_replace_read);
 
 	ret = memp_fget(mpf, &argp->pgno, 0, &pagep);
-	if (ret != 0)
+	if (ret != 0) {
 		if (!redo) {
 			/*
 			 * We are undoing and the page doesn't exist.  That
@@ -398,6 +401,7 @@ __ham_replace_recover(logp, dbtp, lsnp, redo, info)
 		} else if ((ret = memp_fget(mpf, &argp->pgno,
 		    DB_MPOOL_CREATE, &pagep)) != 0)
 			goto out;
+	}
 
 	hashp = (HTAB *)file_dbp->internal;
 	GET_META(file_dbp, hashp);
@@ -518,7 +522,7 @@ __ham_newpgno_recover(logp, dbtp, lsnp, redo, info)
 	/* Now check the newly allocated/freed page. */
 	ret = memp_fget(mpf, &argp->pgno, 0, &pagep);
 
-	if (ret != 0)
+	if (ret != 0) {
 		if (!redo) {
 			/*
 			 * We are undoing and the page doesn't exist.  That
@@ -532,6 +536,7 @@ __ham_newpgno_recover(logp, dbtp, lsnp, redo, info)
 		} else if ((ret = memp_fget(mpf, &argp->pgno,
 		    DB_MPOOL_CREATE, &pagep)) != 0)
 			goto out;
+	}
 
 	cmp_n = log_compare(lsnp, &LSN(pagep));
 	cmp_p = log_compare(&LSN(pagep), &argp->pagelsn);
@@ -672,7 +677,7 @@ __ham_splitdata_recover(logp, dbtp, lsnp, redo, info)
 	REC_INTRO(__ham_splitdata_read);
 
 	ret = memp_fget(mpf, &argp->pgno, 0, &pagep);
-	if (ret != 0)
+	if (ret != 0) {
 		if (!redo) {
 			/*
 			 * We are undoing and the page doesn't exist.  That
@@ -686,6 +691,7 @@ __ham_splitdata_recover(logp, dbtp, lsnp, redo, info)
 		} else if ((ret = memp_fget(mpf, &argp->pgno,
 		    DB_MPOOL_CREATE, &pagep)) != 0)
 			goto out;
+	}
 
 	hashp = (HTAB *)file_dbp->internal;
 	GET_META(file_dbp, hashp);
@@ -850,7 +856,7 @@ __ham_copypage_recover(logp, dbtp, lsnp, redo, info)
 
 	/* This is the bucket page. */
 	ret = memp_fget(mpf, &argp->pgno, 0, &pagep);
-	if (ret != 0)
+	if (ret != 0) {
 		if (!redo) {
 			/*
 			 * We are undoing and the page doesn't exist.  That
@@ -863,6 +869,7 @@ __ham_copypage_recover(logp, dbtp, lsnp, redo, info)
 		} else if ((ret = memp_fget(mpf, &argp->pgno,
 		    DB_MPOOL_CREATE, &pagep)) != 0)
 			goto out;
+	}
 
 	cmp_n = log_compare(lsnp, &LSN(pagep));
 	cmp_p = log_compare(&LSN(pagep), &argp->pagelsn);
@@ -884,7 +891,7 @@ __ham_copypage_recover(logp, dbtp, lsnp, redo, info)
 
 	/* Now fix up the "next" page. */
 donext:	ret = memp_fget(mpf, &argp->next_pgno, 0, &pagep);
-	if (ret != 0)
+	if (ret != 0) {
 		if (!redo) {
 			/*
 			 * We are undoing and the page doesn't exist.  That
@@ -897,6 +904,7 @@ donext:	ret = memp_fget(mpf, &argp->next_pgno, 0, &pagep);
 		} else if ((ret = memp_fget(mpf, &argp->next_pgno,
 		    DB_MPOOL_CREATE, &pagep)) != 0)
 			goto out;
+	}
 
 	/* There is nothing to do in the REDO case; only UNDO. */
 
@@ -916,7 +924,7 @@ do_nn:	if (argp->nnext_pgno == PGNO_INVALID) {
 	}
 
 	ret = memp_fget(mpf, &argp->nnext_pgno, 0, &pagep);
-	if (ret != 0)
+	if (ret != 0) {
 		if (!redo) {
 			/*
 			 * We are undoing and the page doesn't exist.  That
@@ -930,6 +938,7 @@ do_nn:	if (argp->nnext_pgno == PGNO_INVALID) {
 		} else if ((ret = memp_fget(mpf, &argp->nnext_pgno,
 		    DB_MPOOL_CREATE, &pagep)) != 0)
 			goto out;
+	}
 
 	cmp_n = log_compare(lsnp, &LSN(pagep));
 	cmp_p = log_compare(&LSN(pagep), &argp->nnextlsn);