diff options
author | Alex Gorrod <alexander.gorrod@mongodb.com> | 2017-02-17 11:16:55 +1100 |
---|---|---|
committer | Alex Gorrod <alexander.gorrod@mongodb.com> | 2017-02-17 11:16:55 +1100 |
commit | e1bcc30da91eedd0b17cebb725cc7e607ffa2340 (patch) | |
tree | f4cf5e09a0b9f9ec6d9e36eeb124d976f5c5b107 /src/utilities/util_create.c | |
parent | 48a3cbc17fa902528217287fd075c87efb44aebc (diff) | |
parent | 8a1adcc4a1c4c25e1270290a8eb21173f41e83a9 (diff) | |
download | mongodb-3.5.4.tar.gz |
Merge branch 'develop' into mongodb-3.6mongodb-3.5.4
Diffstat (limited to 'src/utilities/util_create.c')
-rw-r--r-- | src/utilities/util_create.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/utilities/util_create.c b/src/utilities/util_create.c index 4e609736f2d..7c22a67792b 100644 --- a/src/utilities/util_create.c +++ b/src/utilities/util_create.c @@ -15,9 +15,9 @@ util_create(WT_SESSION *session, int argc, char *argv[]) { WT_DECL_RET; int ch; - const char *config, *uri; + char *config, *uri; - config = NULL; + config = uri = NULL; while ((ch = __wt_getopt(progname, argc, argv, "c:")) != EOF) switch (ch) { case 'c': /* command-line configuration */ @@ -35,12 +35,14 @@ util_create(WT_SESSION *session, int argc, char *argv[]) if (argc != 1) return (usage()); - if ((uri = util_name(session, *argv, "table")) == NULL) + if ((uri = util_uri(session, *argv, "table")) == NULL) return (1); if ((ret = session->create(session, uri, config)) != 0) - return (util_err(session, ret, "%s: session.create", uri)); - return (0); + (void)util_err(session, ret, "session.create: %s", uri); + + free(uri); + return (ret); } static int |