diff options
Diffstat (limited to 'src/utilities/util_main.c')
| -rw-r--r-- | src/utilities/util_main.c | 32 |
1 files changed, 14 insertions, 18 deletions
diff --git a/src/utilities/util_main.c b/src/utilities/util_main.c index 3274f3a0fd0..51a11f82c43 100644 --- a/src/utilities/util_main.c +++ b/src/utilities/util_main.c @@ -169,25 +169,21 @@ main(int argc, char *argv[]) if (func == NULL) return (usage()); - /* Build the configuration string, as necessary. */ - if (cmd_config != NULL || rec_config != NULL) { - len = 10; /* some slop */ - if (config != NULL) - len += strlen(config); - if (cmd_config != NULL) - len += strlen(cmd_config); - if (rec_config != NULL) - len += strlen(rec_config); - if ((p = malloc(len)) == NULL) { - ret = util_err(errno, NULL); - goto err; - } - (void)snprintf(p, len, "%s,%s,%s", - config == NULL ? "" : config, - cmd_config == NULL ? "" : cmd_config, - rec_config == NULL ? "" : rec_config); - config = p; + /* Build the configuration string. */ + len = 10; /* some slop */ + if (config != NULL) + len += strlen(config); + if (cmd_config != NULL) + len += strlen(cmd_config); + len += strlen(rec_config); + if ((p = malloc(len)) == NULL) { + ret = util_err(errno, NULL); + goto err; } + (void)snprintf(p, len, "%s,%s,%s", + config == NULL ? "" : config, + cmd_config == NULL ? "" : cmd_config, rec_config); + config = p; /* Open the database and a session. */ if ((ret = wiredtiger_open(home, |