summaryrefslogtreecommitdiff
path: root/src/meta
diff options
context:
space:
mode:
authorKeith Bostic <keith@wiredtiger.com>2013-04-09 20:17:58 -0400
committerKeith Bostic <keith@wiredtiger.com>2013-04-09 20:17:58 -0400
commit89b23edbdcdb3b28632ec78f12fe74a4040c7931 (patch)
treedef416c113c643e57e655b0a0bdcf29ff41e0b50 /src/meta
parente7362450cb2b8af22c65a9215cff212ddd9cde01 (diff)
downloadmongo-89b23edbdcdb3b28632ec78f12fe74a4040c7931.tar.gz
Support new configuration options added by the applications, using a new
method, WT_CONNECTION::configure_method. For some reason I can'quite figure out, this set of changes made lint run a bunch better on some sources, and showed up a few different uninitialized variables in error paths. Got me why, but they're real, and I fixed them.
Diffstat (limited to 'src/meta')
-rw-r--r--src/meta/meta_table.c2
-rw-r--r--src/meta/meta_turtle.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/meta/meta_table.c b/src/meta/meta_table.c
index bc904551641..c9b65efad11 100644
--- a/src/meta/meta_table.c
+++ b/src/meta/meta_table.c
@@ -107,7 +107,7 @@ __wt_metadata_cursor(
WT_DATA_HANDLE *saved_dhandle;
WT_DECL_RET;
const char *cfg[] =
- { WT_CONFIG_VALUE(session, session_open_cursor), config, NULL };
+ { WT_CONFIG_NAME(session, session_open_cursor), config, NULL };
saved_dhandle = session->dhandle;
WT_ERR(__wt_metadata_open(session));
diff --git a/src/meta/meta_turtle.c b/src/meta/meta_turtle.c
index 1fd0bd3fb6b..e82f86a6af7 100644
--- a/src/meta/meta_turtle.c
+++ b/src/meta/meta_turtle.c
@@ -40,7 +40,7 @@ __wt_meta_turtle_init(WT_SESSION_IMPL *session, int *existp)
WT_ERR(__wt_buf_fmt(session, buf,
"key_format=S,value_format=S,version=(major=%d,minor=%d)",
WT_BTREE_MAJOR_VERSION, WT_BTREE_MINOR_VERSION));
- cfg[0] = WT_CONFIG_VALUE(session, file_meta);
+ cfg[0] = WT_CONFIG_NAME(session, file_meta);
cfg[1] = buf->data;
cfg[2] = NULL;
WT_ERR(__wt_config_collapse(session, cfg, &metaconf));