summaryrefslogtreecommitdiff
path: root/ext
diff options
context:
space:
mode:
authorKeith Bostic <keith@wiredtiger.com>2014-02-26 07:18:31 -0500
committerKeith Bostic <keith@wiredtiger.com>2014-02-26 07:18:31 -0500
commit99305a5414b8140472cc45e2aec926da5c7a0046 (patch)
tree3057f895c53279f627df14a93154b3e95f5d2310 /ext
parent7c7288b28406a65fcc64a35e19c0506a0a2f2f35 (diff)
downloadmongo-99305a5414b8140472cc45e2aec926da5c7a0046.tar.gz
Fix typo when closing config_parser handle, complain if the
config_parser.close method errors.
Diffstat (limited to 'ext')
-rw-r--r--ext/datasources/helium/helium.c12
1 files changed, 7 insertions, 5 deletions
diff --git a/ext/datasources/helium/helium.c b/ext/datasources/helium/helium.c
index c8a6fe99bb0..cc420c89999 100644
--- a/ext/datasources/helium/helium.c
+++ b/ext/datasources/helium/helium.c
@@ -2102,7 +2102,7 @@ helium_session_open_cursor(WT_DATA_SOURCE *wtds, WT_SESSION *session,
WT_CURSOR *wtcursor;
WT_EXTENSION_API *wtext;
WT_SOURCE *ws;
- int locked, ret, t_ret;
+ int locked, ret, tret;
const char *value;
*new_cursor = NULL;
@@ -2113,7 +2113,7 @@ helium_session_open_cursor(WT_DATA_SOURCE *wtds, WT_SESSION *session,
wtext = ds->wtext;
ws = NULL;
locked = 0;
- ret = t_ret = 0;
+ ret = tret = 0;
value = NULL;
/* Allocate and initialize a cursor. */
@@ -2227,9 +2227,11 @@ err: if (ws != NULL && locked)
ESET(unlock(wtext, session, &ws->lock));
cursor_destroy(cursor);
}
- if (config_parser != NULL && (t_ret =
- (void)config_parser->close(config_parser)) != 0 && ret == 0)
- ret = t_ret;
+ if (config_parser != NULL &&
+ (tret = config_parser->close(config_parser)) != 0)
+ EMSG(wtext, session, tret,
+ "WT_CONFIG_PARSER.close: %s", wtext->strerror(tret));
+
free((void *)value);
return (ret);
}