diff options
Diffstat (limited to 'bench')
-rw-r--r-- | bench/wtperf/config.c | 11 | ||||
-rw-r--r-- | bench/wtperf/wtperf.c | 2 | ||||
-rw-r--r-- | bench/wtperf/wtperf.h | 3 |
3 files changed, 10 insertions, 6 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--; /* diff --git a/bench/wtperf/wtperf.c b/bench/wtperf/wtperf.c index 1a3d98d3e3e..9d35f6fa640 100644 --- a/bench/wtperf/wtperf.c +++ b/bench/wtperf/wtperf.c @@ -2608,7 +2608,7 @@ wtperf_rand(CONFIG_THREAD *thread) S2 = wtperf_value_range(cfg) * (cfg->pareto / 100.0) * (PARETO_SHAPE - 1); U = 1 - (double)rval / (double)UINT32_MAX; - rval = (pow(U, S1) - 1) * S2; + rval = (uint64_t)((pow(U, S1) - 1) * S2); /* * This Pareto calculation chooses out of range values about * 2% of the time, from my testing. That will lead to the diff --git a/bench/wtperf/wtperf.h b/bench/wtperf/wtperf.h index 83fab4d6028..d874fa4eefe 100644 --- a/bench/wtperf/wtperf.h +++ b/bench/wtperf/wtperf.h @@ -320,6 +320,9 @@ extract_key(char *key_buf, uint64_t *keynop) * Print message and exit on failure. */ static inline void +die(int, const char *) + WT_GCC_FUNC_DECL_ATTRIBUTE((noreturn)); +static inline void die(int e, const char *str) { fprintf(stderr, "Call to %s failed: %s", str, wiredtiger_strerror(e)); |