diff options
author | Keith Bostic <keith@wiredtiger.com> | 2016-02-11 11:33:32 -0500 |
---|---|---|
committer | Keith Bostic <keith@wiredtiger.com> | 2016-02-11 11:33:32 -0500 |
commit | 57a2850705431dd4b6cbde841e912a92fcb0bbe8 (patch) | |
tree | cdd1ad92e73ffb552ce0529549e731b133df205f | |
parent | 3bc10f558dd1311581c74d89db11ec74844258c8 (diff) | |
download | mongo-57a2850705431dd4b6cbde841e912a92fcb0bbe8.tar.gz |
WT-2393: Unnecessary error handling labels.
Remove a few unnecessary error handling labels.
-rw-r--r-- | src/cursor/cur_join.c | 42 | ||||
-rw-r--r-- | src/cursor/cur_stat.c | 6 | ||||
-rw-r--r-- | src/packing/pack_impl.c | 16 |
3 files changed, 26 insertions, 38 deletions
diff --git a/src/cursor/cur_join.c b/src/cursor/cur_join.c index 556b6f7ea2a..797e6e5879a 100644 --- a/src/cursor/cur_join.c +++ b/src/cursor/cur_join.c @@ -74,18 +74,16 @@ static int __curjoin_pack_recno(WT_SESSION_IMPL *session, uint64_t r, uint8_t *buf, size_t bufsize, WT_ITEM *item) { - WT_DECL_RET; WT_SESSION *wtsession; size_t sz; wtsession = (WT_SESSION *)session; - WT_ERR(wiredtiger_struct_size(wtsession, &sz, "r", r)); + WT_RET(wiredtiger_struct_size(wtsession, &sz, "r", r)); WT_ASSERT(session, sz < bufsize); - WT_ERR(wiredtiger_struct_pack(wtsession, buf, bufsize, "r", r)); + WT_RET(wiredtiger_struct_pack(wtsession, buf, bufsize, "r", r)); item->size = sz; item->data = buf; - -err: return (ret); + return (0); } /* @@ -99,12 +97,11 @@ __curjoin_entry_iter_next(WT_CURSOR_JOIN_ITER *iter, WT_ITEM *primkey, { WT_CURSOR *firstcg_cur; WT_CURSOR_JOIN *cjoin; - WT_DECL_RET; WT_SESSION_IMPL *session; uint64_t r; if (iter->positioned) - WT_ERR(iter->cursor->next(iter->cursor)); + WT_RET(iter->cursor->next(iter->cursor)); else iter->positioned = true; @@ -121,7 +118,7 @@ __curjoin_entry_iter_next(WT_CURSOR_JOIN_ITER *iter, WT_ITEM *primkey, firstcg_cur = ((WT_CURSOR_TABLE *)iter->cursor)->cg_cursors[0]; if (WT_CURSOR_RECNO(&cjoin->iface)) { r = *(uint64_t *)firstcg_cur->key.data; - WT_ERR(__curjoin_pack_recno(session, r, cjoin->recno_buf, + WT_RET(__curjoin_pack_recno(session, r, cjoin->recno_buf, sizeof(cjoin->recno_buf), primkey)); *rp = r; } else { @@ -131,8 +128,7 @@ __curjoin_entry_iter_next(WT_CURSOR_JOIN_ITER *iter, WT_ITEM *primkey, iter->curkey = primkey; iter->entry->stats.actual_count++; iter->entry->stats.accesses++; - -err: return (ret); + return (0); } /* @@ -143,17 +139,14 @@ err: return (ret); static int __curjoin_entry_iter_reset(WT_CURSOR_JOIN_ITER *iter) { - WT_DECL_RET; - if (iter->positioned) { - WT_ERR(iter->cursor->reset(iter->cursor)); - WT_ERR(__wt_cursor_dup_position( + WT_RET(iter->cursor->reset(iter->cursor)); + WT_RET(__wt_cursor_dup_position( iter->cjoin->entries[0].ends[0].cursor, iter->cursor)); iter->positioned = false; iter->entry->stats.actual_count = 0; } - -err: return (ret); + return (0); } /* @@ -371,7 +364,6 @@ __curjoin_endpoint_init_key(WT_SESSION_IMPL *session, { WT_CURSOR *cursor; WT_CURSOR_INDEX *cindex; - WT_DECL_RET; WT_ITEM *k; uint64_t r; @@ -379,7 +371,7 @@ __curjoin_endpoint_init_key(WT_SESSION_IMPL *session, if (entry->index != NULL) { /* Extract and save the index's logical key. */ cindex = (WT_CURSOR_INDEX *)endpoint->cursor; - WT_ERR(__wt_struct_repack(session, + WT_RET(__wt_struct_repack(session, cindex->child->key_format, (entry->repack_format != NULL ? entry->repack_format : cindex->iface.key_format), @@ -388,7 +380,7 @@ __curjoin_endpoint_init_key(WT_SESSION_IMPL *session, k = &((WT_CURSOR_TABLE *)cursor)->cg_cursors[0]->key; if (WT_CURSOR_RECNO(cursor)) { r = *(uint64_t *)k->data; - WT_ERR(__curjoin_pack_recno(session, r, + WT_RET(__curjoin_pack_recno(session, r, endpoint->recno_buf, sizeof(endpoint->recno_buf), &endpoint->key)); @@ -397,8 +389,7 @@ __curjoin_endpoint_init_key(WT_SESSION_IMPL *session, endpoint->key = *k; } } - -err: return (ret); + return (0); } /* @@ -511,29 +502,28 @@ __curjoin_entry_in_range(WT_SESSION_IMPL *session, WT_CURSOR_JOIN_ENTRY *entry, { WT_COLLATOR *collator; WT_CURSOR_JOIN_ENDPOINT *end, *endmax; - WT_DECL_RET; int cmp; collator = (entry->index != NULL) ? entry->index->collator : NULL; endmax = &entry->ends[entry->ends_next]; for (end = &entry->ends[skip_left ? 1 : 0]; end < endmax; end++) { - WT_ERR(__wt_compare(session, collator, curkey, &end->key, + WT_RET(__wt_compare(session, collator, curkey, &end->key, &cmp)); if (!F_ISSET(end, WT_CURJOIN_END_LT)) { if (cmp < 0 || (cmp == 0 && !F_ISSET(end, WT_CURJOIN_END_EQ)) || (cmp > 0 && !F_ISSET(end, WT_CURJOIN_END_GT))) - WT_ERR(WT_NOTFOUND); + WT_RET(WT_NOTFOUND); } else { if (cmp > 0 || (cmp == 0 && !F_ISSET(end, WT_CURJOIN_END_EQ)) || (cmp < 0 && !F_ISSET(end, WT_CURJOIN_END_LT))) - WT_ERR(WT_NOTFOUND); + WT_RET(WT_NOTFOUND); } } -err: return (ret); + return (0); } typedef struct { diff --git a/src/cursor/cur_stat.c b/src/cursor/cur_stat.c index 00a6ade21c6..bb492c66ace 100644 --- a/src/cursor/cur_stat.c +++ b/src/cursor/cur_stat.c @@ -504,14 +504,13 @@ __curstat_join_init(WT_SESSION_IMPL *session, WT_CURSOR *curjoin, const char *cfg[], WT_CURSOR_STAT *cst) { WT_CURSOR_JOIN *cjoin; - WT_DECL_RET; WT_UNUSED(cfg); if (curjoin == NULL && cst->u.join_stats_group.join_cursor != NULL) curjoin = &cst->u.join_stats_group.join_cursor->iface; if (curjoin == NULL || !WT_PREFIX_MATCH(curjoin->uri, "join:")) - WT_ERR_MSG(session, EINVAL, + WT_RET_MSG(session, EINVAL, "join cursor must be used with statistics:join"); cjoin = (WT_CURSOR_JOIN *)curjoin; memset(&cst->u.join_stats_group, 0, sizeof(WT_JOIN_STATS_GROUP)); @@ -522,8 +521,7 @@ __curstat_join_init(WT_SESSION_IMPL *session, cst->stats_count = sizeof(WT_JOIN_STATS) / sizeof(int64_t); cst->stats_desc = __curstat_join_desc; cst->next_set = __curstat_join_next_set; - -err: return (ret); + return (0); } /* diff --git a/src/packing/pack_impl.c b/src/packing/pack_impl.c index bd1c90525a6..2bd850bfc9a 100644 --- a/src/packing/pack_impl.c +++ b/src/packing/pack_impl.c @@ -157,24 +157,24 @@ __wt_struct_repack(WT_SESSION_IMPL *session, const char *infmt, p = inbuf->data; end = p + inbuf->size; - WT_ERR(__pack_init(session, &packout, outfmt)); - WT_ERR(__pack_init(session, &packin, infmt)); + WT_RET(__pack_init(session, &packout, outfmt)); + WT_RET(__pack_init(session, &packin, infmt)); /* Outfmt should complete before infmt */ while ((ret = __pack_next(&packout, &pvout)) == 0) { if (p >= end) - WT_ERR(EINVAL); + WT_RET(EINVAL); if (pvout.type == 'x' && pvout.size == 0 && pvout.havesize) continue; - WT_ERR(__pack_next(&packin, &pvin)); + WT_RET(__pack_next(&packin, &pvin)); before = p; - WT_ERR(__unpack_read(session, &pvin, &p, (size_t)(end - p))); + WT_RET(__unpack_read(session, &pvin, &p, (size_t)(end - p))); if (pvout.type != pvin.type) - WT_ERR(ENOTSUP); + WT_RET(ENOTSUP); if (start == NULL) start = before; } - WT_ERR_NOTFOUND_OK(ret); + WT_RET_NOTFOUND_OK(ret); /* Be paranoid - __pack_write should never overflow. */ WT_ASSERT(session, p <= end); @@ -182,5 +182,5 @@ __wt_struct_repack(WT_SESSION_IMPL *session, const char *infmt, outbuf->data = start; outbuf->size = WT_PTRDIFF(p, start); -err: return (ret); + return (0); } |