summaryrefslogtreecommitdiff
path: root/src/third_party/wiredtiger/src/btree/bt_curnext.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/third_party/wiredtiger/src/btree/bt_curnext.c')
-rw-r--r--src/third_party/wiredtiger/src/btree/bt_curnext.c15
1 files changed, 10 insertions, 5 deletions
diff --git a/src/third_party/wiredtiger/src/btree/bt_curnext.c b/src/third_party/wiredtiger/src/btree/bt_curnext.c
index 94fe29d468d..7744ebc40eb 100644
--- a/src/third_party/wiredtiger/src/btree/bt_curnext.c
+++ b/src/third_party/wiredtiger/src/btree/bt_curnext.c
@@ -214,7 +214,8 @@ __cursor_var_next(WT_CURSOR_BTREE *cbt, bool newpage, bool restart)
__cursor_set_recno(cbt, cbt->recno + 1);
new_page:
-restart_read: /* Find the matching WT_COL slot. */
+restart_read:
+ /* Find the matching WT_COL slot. */
if ((cip =
__col_var_search(cbt->ref, cbt->recno, &rle_start)) == NULL)
return (WT_NOTFOUND);
@@ -497,7 +498,8 @@ __wt_cursor_key_order_check(
return (__cursor_key_order_check_col(session, cbt, next));
case WT_PAGE_ROW_LEAF:
return (__cursor_key_order_check_row(session, cbt, next));
- WT_ILLEGAL_VALUE(session, cbt->ref->page->type);
+ default:
+ return (__wt_illegal_value(session, cbt->ref->page->type));
}
/* NOTREACHED */
}
@@ -522,7 +524,8 @@ __wt_cursor_key_order_init(WT_SESSION_IMPL *session, WT_CURSOR_BTREE *cbt)
case WT_PAGE_ROW_LEAF:
return (__wt_buf_set(session,
cbt->lastkey, cbt->iface.key.data, cbt->iface.key.size));
- WT_ILLEGAL_VALUE(session, cbt->ref->page->type);
+ default:
+ return (__wt_illegal_value(session, cbt->ref->page->type));
}
/* NOTREACHED */
}
@@ -666,7 +669,8 @@ __wt_btcur_next(WT_CURSOR_BTREE *cbt, bool truncating)
ret = __cursor_var_append_next(
cbt, newpage, restart);
break;
- WT_ILLEGAL_VALUE_ERR(session, page->type);
+ default:
+ WT_ERR(__wt_illegal_value(session, page->type));
}
if (ret == 0 || ret == WT_PREPARE_CONFLICT)
break;
@@ -684,7 +688,8 @@ __wt_btcur_next(WT_CURSOR_BTREE *cbt, bool truncating)
case WT_PAGE_ROW_LEAF:
ret = __cursor_row_next(cbt, newpage, restart);
break;
- WT_ILLEGAL_VALUE_ERR(session, page->type);
+ default:
+ WT_ERR(__wt_illegal_value(session, page->type));
}
if (ret != WT_NOTFOUND)
break;