diff options
| author | David Hows <david.hows@mongodb.com> | 2016-06-24 17:05:13 +1000 |
|---|---|---|
| committer | David Hows <david.hows@mongodb.com> | 2016-06-24 17:05:13 +1000 |
| commit | d8fb874fc40989cb9675e56ca80b3b64e6fa2ee3 (patch) | |
| tree | 6f03ed5cde97aedc762215c14d23ee5305998a2b /bench/wtperf/config.c | |
| parent | fb1663e6fc800be97c0ddc697b6f939dc610e08e (diff) | |
| parent | 1f4aaa4490a82cf947afdabbb9214ee5b1850d13 (diff) | |
| download | mongo-d8fb874fc40989cb9675e56ca80b3b64e6fa2ee3.tar.gz | |
Merge branch 'develop' of github.com:wiredtiger/wiredtiger into mongodb-3.4mongodb-3.3.9mongodb-3.3.10mongodb-3.0.1
Diffstat (limited to 'bench/wtperf/config.c')
| -rw-r--r-- | bench/wtperf/config.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/bench/wtperf/config.c b/bench/wtperf/config.c index d8c2de6e587..0dc38287155 100644 --- a/bench/wtperf/config.c +++ b/bench/wtperf/config.c @@ -170,7 +170,7 @@ config_free(CONFIG *cfg) if (config_opts[i].type == STRING_TYPE || config_opts[i].type == CONFIG_STRING_TYPE) { pstr = (char **) - ((unsigned char *)cfg + config_opts[i].offset); + ((u_char *)cfg + config_opts[i].offset); free(*pstr); *pstr = NULL; } @@ -431,7 +431,7 @@ config_opt(CONFIG *cfg, WT_CONFIG_ITEM *k, WT_CONFIG_ITEM *v) fprintf(stderr, "\t%s\n", config_opts[i].name); return (EINVAL); } - valueloc = ((unsigned char *)cfg + popt->offset); + valueloc = ((u_char *)cfg + popt->offset); switch (popt->type) { case BOOL_TYPE: if (v->type != WT_CONFIG_ITEM_BOOL) { @@ -560,7 +560,8 @@ config_opt_file(CONFIG *cfg, const char *filename) linenum++; /* Skip leading space. */ - for (ltrim = line; *ltrim && isspace(*ltrim); ltrim++) + for (ltrim = line; *ltrim && isspace((u_char)*ltrim); + ltrim++) ; /* @@ -579,7 +580,7 @@ config_opt_file(CONFIG *cfg, const char *filename) } /* Skip trailing space. */ - while (rtrim > ltrim && isspace(rtrim[-1])) + while (rtrim > ltrim && isspace((u_char)rtrim[-1])) rtrim--; /* @@ -599,7 +600,7 @@ config_opt_file(CONFIG *cfg, const char *filename) rtrim = comment; /* Skip trailing space again. */ - while (rtrim > ltrim && isspace(rtrim[-1])) + while (rtrim > ltrim && isspace((u_char)rtrim[-1])) rtrim--; /* |