Stylistic change only: I'm about to put in panic checks, make the style

of API_END/return consistent, a blank line before the error label,
API_END next to the return.

6 files changed, 29 insertions, 39 deletions

diff --git a/src/cursor/cur_bulk.c b/src/cursor/cur_bulk.c
index 6199bb015be..e1e05d0a5ca 100644
--- a/src/cursor/cur_bulk.c
+++ b/src/cursor/cur_bulk.c
@@ -31,8 +31,8 @@ __curbulk_insert(WT_CURSOR *cursor)
 		WT_CURSOR_NEEDKEY(cursor);
 	WT_CURSOR_NEEDVALUE(cursor);
 	WT_ERR(__wt_bulk_insert(cbulk));
-err:	API_END(session);
 
+err:	API_END(session);
 	return (ret);
 }
 
@@ -60,8 +60,8 @@ __curbulk_close(WT_CURSOR *cursor)
 	/* The URI is owned by the btree handle. */
 	cursor->uri = NULL;
 	WT_TRET(__wt_cursor_close(cursor));
-	API_END(session);
 
+	API_END(session);
 	return (ret);
 }
 
diff --git a/src/cursor/cur_dump.c b/src/cursor/cur_dump.c
index dc86d2581c5..ba5d5bb57d7 100644
--- a/src/cursor/cur_dump.c
+++ b/src/cursor/cur_dump.c
@@ -155,7 +155,6 @@ __curdump_set_key(WT_CURSOR *cursor, ...)
 err:		cursor->saved_err = ret;
 		F_CLR(cursor, WT_CURSTD_KEY_SET);
 	}
-
 	API_END(session);
 }
 
@@ -229,7 +228,6 @@ __curdump_set_value(WT_CURSOR *cursor, ...)
 err:		cursor->saved_err = ret;
 		F_CLR(cursor, WT_CURSTD_VALUE_SET);
 	}
-
 	API_END(session);
 }
 
@@ -279,8 +277,8 @@ __curdump_close(WT_CURSOR *cursor)
 	/* We shared the child's URI. */
 	cursor->uri = NULL;
 	WT_TRET(__wt_cursor_close(cursor));
-	API_END(session);
 
+	API_END(session);
 	return (ret);
 }
 
diff --git a/src/cursor/cur_file.c b/src/cursor/cur_file.c
index 76c2711ba1b..2aeaa1c8592 100644
--- a/src/cursor/cur_file.c
+++ b/src/cursor/cur_file.c
@@ -34,8 +34,8 @@ __curfile_compare(WT_CURSOR *a, WT_CURSOR *b, int *cmpp)
 
 	ret = __wt_btcur_compare(
 	    (WT_CURSOR_BTREE *)a, (WT_CURSOR_BTREE *)b, cmpp);
-err:	API_END(session);
 
+err:	API_END(session);
 	return (ret);
 }
 
@@ -53,8 +53,8 @@ __curfile_next(WT_CURSOR *cursor)
 	cbt = (WT_CURSOR_BTREE *)cursor;
 	CURSOR_API_CALL(cursor, session, next, cbt->btree);
 	ret = __wt_btcur_next((WT_CURSOR_BTREE *)cursor, 0);
-	API_END(session);
 
+	API_END(session);
 	return (ret);
 }
 
@@ -73,8 +73,8 @@ __curfile_next_random(WT_CURSOR *cursor)
 	cbt = (WT_CURSOR_BTREE *)cursor;
 	CURSOR_API_CALL(cursor, session, next, cbt->btree);
 	ret = __wt_btcur_next_random(cbt);
-	API_END(session);
 
+	API_END(session);
 	return (ret);
 }
 
@@ -92,8 +92,8 @@ __curfile_prev(WT_CURSOR *cursor)
 	cbt = (WT_CURSOR_BTREE *)cursor;
 	CURSOR_API_CALL(cursor, session, prev, cbt->btree);
 	ret = __wt_btcur_prev((WT_CURSOR_BTREE *)cursor, 0);
-	API_END(session);
 
+	API_END(session);
 	return (ret);
 }
 
@@ -111,8 +111,8 @@ __curfile_reset(WT_CURSOR *cursor)
 	cbt = (WT_CURSOR_BTREE *)cursor;
 	CURSOR_API_CALL(cursor, session, reset, cbt->btree);
 	ret = __wt_btcur_reset(cbt);
-	API_END(session);
 
+	API_END(session);
 	return (ret);
 }
 
@@ -131,8 +131,8 @@ __curfile_search(WT_CURSOR *cursor)
 	CURSOR_API_CALL(cursor, session, search, cbt->btree);
 	WT_CURSOR_NEEDKEY(cursor);
 	ret = __wt_btcur_search(cbt);
-err:	API_END(session);
 
+err:	API_END(session);
 	return (ret);
 }
 
@@ -151,8 +151,8 @@ __curfile_search_near(WT_CURSOR *cursor, int *exact)
 	CURSOR_API_CALL(cursor, session, search_near, cbt->btree);
 	WT_CURSOR_NEEDKEY(cursor);
 	ret = __wt_btcur_search_near(cbt, exact);
-err:	API_END(session);
 
+err:	API_END(session);
 	return (ret);
 }
 
@@ -173,8 +173,8 @@ __curfile_insert(WT_CURSOR *cursor)
 		WT_CURSOR_NEEDKEY(cursor);
 	WT_CURSOR_NEEDVALUE(cursor);
 	ret = __wt_btcur_insert((WT_CURSOR_BTREE *)cursor);
-err:	CURSOR_UPDATE_API_END(session, ret);
 
+err:	CURSOR_UPDATE_API_END(session, ret);
 	return (ret);
 }
 
@@ -194,8 +194,8 @@ __curfile_update(WT_CURSOR *cursor)
 	WT_CURSOR_NEEDKEY(cursor);
 	WT_CURSOR_NEEDVALUE(cursor);
 	ret = __wt_btcur_update((WT_CURSOR_BTREE *)cursor);
-err:	CURSOR_UPDATE_API_END(session, ret);
 
+err:	CURSOR_UPDATE_API_END(session, ret);
 	return (ret);
 }
 
@@ -214,8 +214,8 @@ __curfile_remove(WT_CURSOR *cursor)
 	CURSOR_UPDATE_API_CALL(cursor, session, remove, cbt->btree);
 	WT_CURSOR_NEEDKEY(cursor);
 	ret = __wt_btcur_remove((WT_CURSOR_BTREE *)cursor);
-err:	CURSOR_UPDATE_API_END(session, ret);
 
+err:	CURSOR_UPDATE_API_END(session, ret);
 	return (ret);
 }
 
@@ -266,8 +266,8 @@ __curfile_close(WT_CURSOR *cursor)
 	/* The URI is owned by the btree handle. */
 	cursor->uri = NULL;
 	WT_TRET(__wt_cursor_close(cursor));
-	API_END(session);
 
+	API_END(session);
 	return (ret);
 }
 
diff --git a/src/cursor/cur_index.c b/src/cursor/cur_index.c
index 51e3db33c10..5e9ef2d968f 100644
--- a/src/cursor/cur_index.c
+++ b/src/cursor/cur_index.c
@@ -38,8 +38,8 @@ __curindex_get_value(WT_CURSOR *cursor, ...)
 		ret = __wt_schema_project_out(session,
 		    cindex->cg_cursors, cindex->value_plan, ap);
 	va_end(ap);
-err:	API_END(session);
 
+err:	API_END(session);
 	return (ret);
 }
 
@@ -128,8 +128,8 @@ __curindex_next(WT_CURSOR *cursor)
 		ret = __curindex_move(cindex);
 	else
 		F_CLR(cursor, WT_CURSTD_KEY_SET | WT_CURSTD_VALUE_SET);
-	API_END(session);
 
+	API_END(session);
 	return (ret);
 }
 
@@ -150,8 +150,8 @@ __curindex_prev(WT_CURSOR *cursor)
 		ret = __curindex_move(cindex);
 	else
 		F_CLR(cursor, WT_CURSTD_KEY_SET | WT_CURSTD_VALUE_SET);
-	API_END(session);
 
+	API_END(session);
 	return (ret);
 }
 
@@ -179,8 +179,8 @@ __curindex_reset(WT_CURSOR *cursor)
 			continue;
 		WT_TRET((*cp)->reset(*cp));
 	}
-	API_END(session);
 
+	API_END(session);
 	return (ret);
 }
 
@@ -229,8 +229,8 @@ __curindex_search(WT_CURSOR *cursor)
 	if (0) {
 err:		F_CLR(cursor, WT_CURSTD_KEY_SET | WT_CURSTD_VALUE_SET);
 	}
-	API_END(session);
 
+	API_END(session);
 	return (ret);
 }
 
@@ -252,8 +252,8 @@ __curindex_search_near(WT_CURSOR *cursor, int *exact)
 		ret = __curindex_move(cindex);
 	else
 		F_CLR(cursor, WT_CURSTD_KEY_SET | WT_CURSTD_VALUE_SET);
-	API_END(session);
 
+	API_END(session);
 	return (ret);
 }
 
@@ -297,8 +297,8 @@ __curindex_close(WT_CURSOR *cursor)
 	/* The URI is owned by the index. */
 	cursor->uri = NULL;
 	WT_TRET(__wt_cursor_close(cursor));
-	API_END(session);
 
+	API_END(session);
 	return (ret);
 }
 
diff --git a/src/cursor/cur_table.c b/src/cursor/cur_table.c
index 6eaaf64d052..0c5f2586bc2 100644
--- a/src/cursor/cur_table.c
+++ b/src/cursor/cur_table.c
@@ -95,7 +95,6 @@ __wt_curtable_get_value(WT_CURSOR *cursor, ...)
 		    ctable->cg_cursors, ctable->plan, ap);
 	va_end(ap);
 err:	API_END(session);
-
 	return (ret);
 }
 
@@ -200,7 +199,6 @@ __curtable_compare(WT_CURSOR *a, WT_CURSOR *b, int *cmpp)
 	    WT_CURSOR_PRIMARY(a), WT_CURSOR_PRIMARY(b), cmpp);
 
 err:	API_END(session);
-
 	return (ret);
 }
 
@@ -219,7 +217,6 @@ __curtable_next(WT_CURSOR *cursor)
 	CURSOR_API_CALL(cursor, session, next, NULL);
 	APPLY_CG(ctable, next);
 	API_END(session);
-
 	return (ret);
 }
 
@@ -255,7 +252,6 @@ __curtable_next_random(WT_CURSOR *cursor)
 	}
 
 err:	API_END(session);
-
 	return (ret);
 }
 
@@ -274,7 +270,6 @@ __curtable_prev(WT_CURSOR *cursor)
 	CURSOR_API_CALL(cursor, session, prev, NULL);
 	APPLY_CG(ctable, prev);
 	API_END(session);
-
 	return (ret);
 }
 
@@ -293,7 +288,6 @@ __curtable_reset(WT_CURSOR *cursor)
 	CURSOR_API_CALL(cursor, session, reset, NULL);
 	APPLY_CG(ctable, reset);
 	API_END(session);
-
 	return (ret);
 }
 
@@ -312,7 +306,6 @@ __curtable_search(WT_CURSOR *cursor)
 	CURSOR_API_CALL(cursor, session, search, NULL);
 	APPLY_CG(ctable, search);
 	API_END(session);
-
 	return (ret);
 }
 
@@ -341,8 +334,8 @@ __curtable_search_near(WT_CURSOR *cursor, int *exact)
 		(*cp)->recno = primary->recno;
 		WT_ERR((*cp)->search(*cp));
 	}
-err:	API_END(session);
 
+err:	API_END(session);
 	return (ret);
 }
 
@@ -389,8 +382,8 @@ __curtable_insert(WT_CURSOR *cursor)
 	}
 
 	APPLY_IDX(ctable, insert);
-err:	CURSOR_UPDATE_API_END(session, ret);
 
+err:	CURSOR_UPDATE_API_END(session, ret);
 	return (ret);
 }
 
@@ -429,8 +422,8 @@ __curtable_update(WT_CURSOR *cursor)
 	WT_ERR(ret);
 	if (ctable->idx_cursors != NULL)
 		APPLY_IDX(ctable, insert);
-err:	CURSOR_UPDATE_API_END(session, ret);
 
+err:	CURSOR_UPDATE_API_END(session, ret);
 	return (ret);
 }
 
@@ -457,8 +450,8 @@ __curtable_remove(WT_CURSOR *cursor)
 	}
 
 	APPLY_CG(ctable, remove);
-err:	CURSOR_UPDATE_API_END(session, ret);
 
+err:	CURSOR_UPDATE_API_END(session, ret);
 	return (ret);
 }
 
@@ -627,8 +620,8 @@ __curtable_close(WT_CURSOR *cursor)
 	/* The URI is owned by the table. */
 	cursor->uri = NULL;
 	WT_TRET(__wt_cursor_close(cursor));
-	API_END(session);
 
+	API_END(session);
 	return (ret);
 }
 
diff --git a/src/lsm/lsm_cursor.c b/src/lsm/lsm_cursor.c
index e3a561fd948..fc63671b069 100644
--- a/src/lsm/lsm_cursor.c
+++ b/src/lsm/lsm_cursor.c
@@ -405,8 +405,8 @@ retry:		/*
 	if ((ret = __clsm_get_current(session, clsm, 1, &deleted)) == 0 &&
 	    deleted)
 		goto retry;
-err:	API_END(session);
 
+err:	API_END(session);
 	return (ret);
 }
 
@@ -487,8 +487,8 @@ retry:		/*
 	if ((ret = __clsm_get_current(session, clsm, 0, &deleted)) == 0 &&
 	    deleted)
 		goto retry;
-err:	API_END(session);
 
+err:	API_END(session);
 	return (ret);
 }
 
@@ -517,7 +517,6 @@ __clsm_reset(WT_CURSOR *cursor)
 	F_CLR(cursor, WT_CURSTD_KEY_SET | WT_CURSTD_VALUE_SET);
 	F_CLR(clsm, WT_CLSM_ITERATE_NEXT | WT_CLSM_ITERATE_PREV);
 	API_END(session);
-
 	return (ret);
 }
 
@@ -945,8 +944,8 @@ __clsm_close(WT_CURSOR *cursor)
 	if (clsm->lsm_tree != NULL)
 		__wt_lsm_tree_release(session, clsm->lsm_tree);
 	WT_TRET(__wt_cursor_close(cursor));
-	API_END(session);
 
+	API_END(session);
 	return (ret);
 }