From c92f2aa200236dbfced0f1f9c499ba697a1c2cff Mon Sep 17 00:00:00 2001 From: Don Anderson Date: Thu, 22 Jan 2015 10:57:42 -0500 Subject: Revert "For now, just rename the WiredTiger function __wt_cursor_equals...", since we've resolved the underlying problem. This reverts commit 010059e721d1c6bd4d81214ab80402866de41345. --- src/cursor/cur_ds.c | 2 +- src/cursor/cur_log.c | 2 +- src/cursor/cur_metadata.c | 2 +- src/cursor/cur_std.c | 4 ++-- src/cursor/cur_table.c | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) (limited to 'src/cursor') diff --git a/src/cursor/cur_ds.c b/src/cursor/cur_ds.c index cc3e23570d5..c58d6899150 100644 --- a/src/cursor/cur_ds.c +++ b/src/cursor/cur_ds.c @@ -454,7 +454,7 @@ __wt_curds_open( __wt_cursor_set_key, /* set-key */ __wt_cursor_set_value, /* set-value */ __curds_compare, /* compare */ - __wt_cursor_equal, /* equals */ + __wt_cursor_equals, /* equals */ __curds_next, /* next */ __curds_prev, /* prev */ __curds_reset, /* reset */ diff --git a/src/cursor/cur_log.c b/src/cursor/cur_log.c index 2e2a2530df6..5de3762217f 100644 --- a/src/cursor/cur_log.c +++ b/src/cursor/cur_log.c @@ -344,7 +344,7 @@ __wt_curlog_open(WT_SESSION_IMPL *session, __wt_cursor_set_key, /* set-key */ __wt_cursor_set_value, /* set-value */ __curlog_compare, /* compare */ - __wt_cursor_equal, /* equals */ + __wt_cursor_equals, /* equals */ __curlog_next, /* next */ __wt_cursor_notsup, /* prev */ __curlog_reset, /* reset */ diff --git a/src/cursor/cur_metadata.c b/src/cursor/cur_metadata.c index 31c96e3087a..9860eb65a55 100644 --- a/src/cursor/cur_metadata.c +++ b/src/cursor/cur_metadata.c @@ -409,7 +409,7 @@ __wt_curmetadata_open(WT_SESSION_IMPL *session, __wt_cursor_set_key, /* set-key */ __wt_cursor_set_value, /* set-value */ __curmetadata_compare, /* compare */ - __wt_cursor_equal, /* equals */ + __wt_cursor_equals, /* equals */ __curmetadata_next, /* next */ __curmetadata_prev, /* prev */ __curmetadata_reset, /* reset */ diff --git a/src/cursor/cur_std.c b/src/cursor/cur_std.c index df38eb9e57d..858c6af6853 100644 --- a/src/cursor/cur_std.c +++ b/src/cursor/cur_std.c @@ -480,11 +480,11 @@ __wt_cursor_close(WT_CURSOR *cursor) } /* - * __wt_cursor_equal -- + * __wt_cursor_equals -- * WT_CURSOR->equals default implementation. */ int -__wt_cursor_equal(WT_CURSOR *cursor, WT_CURSOR *other, int *equalp) +__wt_cursor_equals(WT_CURSOR *cursor, WT_CURSOR *other, int *equalp) { WT_DECL_RET; WT_SESSION_IMPL *session; diff --git a/src/cursor/cur_table.c b/src/cursor/cur_table.c index f8e8625b0bd..a046b2b1ed9 100644 --- a/src/cursor/cur_table.c +++ b/src/cursor/cur_table.c @@ -839,7 +839,7 @@ __wt_curtable_open(WT_SESSION_IMPL *session, __wt_curtable_set_key, /* set-key */ __wt_curtable_set_value, /* set-value */ __curtable_compare, /* compare */ - __wt_cursor_equal, /* equals */ + __wt_cursor_equals, /* equals */ __curtable_next, /* next */ __curtable_prev, /* prev */ __curtable_reset, /* reset */ -- cgit v1.2.1