diff options
| author | Keith Bostic <keith@wiredtiger.com> | 2014-10-13 08:35:41 -0400 |
|---|---|---|
| committer | Keith Bostic <keith@wiredtiger.com> | 2014-10-13 08:35:41 -0400 |
| commit | 9ebcf6cc2710a10f13af855f50234af33ae7e6fe (patch) | |
| tree | 40d9ed124268da1d18efe812d69b97bf649e98c3 | |
| parent | 673e174a88d85b1cad9beab50037971d5f546d77 (diff) | |
| download | mongo-9ebcf6cc2710a10f13af855f50234af33ae7e6fe.tar.gz | |
The upgrade configuration string is the same string to which we're
appending new configuration options, clarify that by only using one
parameter.
| -rw-r--r-- | src/config/config_upgrade.c | 5 | ||||
| -rw-r--r-- | src/conn/conn_api.c | 4 | ||||
| -rw-r--r-- | src/include/extern.h | 2 |
3 files changed, 7 insertions, 4 deletions
diff --git a/src/config/config_upgrade.c b/src/config/config_upgrade.c index 50cbc0cdab6..24297df839b 100644 --- a/src/config/config_upgrade.c +++ b/src/config/config_upgrade.c @@ -12,9 +12,12 @@ * Upgrade a configuration string by appended the replacement version. */ int -__wt_config_upgrade(WT_SESSION_IMPL *session, const char *config, WT_ITEM *buf) +__wt_config_upgrade(WT_SESSION_IMPL *session, WT_ITEM *buf) { WT_CONFIG_ITEM v; + const char *config; + + config = buf->data; /* * wiredtiger_open: diff --git a/src/conn/conn_api.c b/src/conn/conn_api.c index 2a7f8cfd9f3..752af8e37f5 100644 --- a/src/conn/conn_api.c +++ b/src/conn/conn_api.c @@ -876,7 +876,7 @@ __conn_config_file(WT_SESSION_IMPL *session, WT_ERR(__conn_config_check_version(session, cbuf->data)); /* Upgrade the configuration string. */ - WT_ERR(__wt_config_upgrade(session, cbuf->data, cbuf)); + WT_ERR(__wt_config_upgrade(session, cbuf)); /* Check the configuration information. */ WT_ERR(__wt_config_check(session, is_user ? @@ -925,7 +925,7 @@ __conn_config_env(WT_SESSION_IMPL *session, const char *cfg[], WT_ITEM *cbuf) WT_RET(__conn_config_check_version(session, env_config)); /* Upgrade the configuration string. */ - WT_RET(__wt_config_upgrade(session, cbuf->data, cbuf)); + WT_RET(__wt_config_upgrade(session, cbuf)); /* Check the configuration information. */ WT_RET(__wt_config_check(session, diff --git a/src/include/extern.h b/src/include/extern.h index 7329dbd7a06..ccca77ef6c2 100644 --- a/src/include/extern.h +++ b/src/include/extern.h @@ -219,7 +219,7 @@ extern int __wt_conn_config_init(WT_SESSION_IMPL *session); extern void __wt_conn_config_discard(WT_SESSION_IMPL *session); extern int __wt_ext_config_parser_open(WT_EXTENSION_API *wt_ext, WT_SESSION *wt_session, const char *config, size_t len, WT_CONFIG_PARSER **config_parserp); extern int __wt_ext_config_get(WT_EXTENSION_API *wt_api, WT_SESSION *wt_session, WT_CONFIG_ARG *cfg_arg, const char *key, WT_CONFIG_ITEM *cval); -extern int __wt_config_upgrade(WT_SESSION_IMPL *session, const char *config, WT_ITEM *buf); +extern int __wt_config_upgrade(WT_SESSION_IMPL *session, WT_ITEM *buf); extern int __wt_collator_config(WT_SESSION_IMPL *session, const char **cfg, WT_COLLATOR **collatorp, int *ownp); extern int __wt_conn_remove_collator(WT_SESSION_IMPL *session); extern int __wt_conn_remove_compressor(WT_SESSION_IMPL *session); |