diff options
| author | Alex Gorrod <alexg@wiredtiger.com> | 2016-03-22 14:49:51 +1100 |
|---|---|---|
| committer | Alex Gorrod <alexg@wiredtiger.com> | 2016-03-22 14:49:51 +1100 |
| commit | 9cf8eb2f15c6df7da90c19c86ccf7516ed126183 (patch) | |
| tree | dd8d22e7b881791e64cd8efaa9d0befb12b2ba84 /bench/wtperf/wtperf.h | |
| parent | 444981a456059f0652fd3bb1968d58d2c37b9089 (diff) | |
| parent | 18e6091d9c16bf46bc8d0750b2227ca71a559c33 (diff) | |
| download | mongo-9cf8eb2f15c6df7da90c19c86ccf7516ed126183.tar.gz | |
Merge branch 'develop' into mongodb-3.4mongodb-3.3.4
Diffstat (limited to 'bench/wtperf/wtperf.h')
| -rw-r--r-- | bench/wtperf/wtperf.h | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/bench/wtperf/wtperf.h b/bench/wtperf/wtperf.h index c591499b907..a2b497b3142 100644 --- a/bench/wtperf/wtperf.h +++ b/bench/wtperf/wtperf.h @@ -337,7 +337,7 @@ generate_key(CONFIG *cfg, char *key_buf, uint64_t keyno) static inline void extract_key(char *key_buf, uint64_t *keynop) { - sscanf(key_buf, "%" SCNu64, keynop); + (void)sscanf(key_buf, "%" SCNu64, keynop); } /* @@ -370,11 +370,11 @@ dmalloc(size_t len) * Call calloc, dying on failure. */ static inline void * -dcalloc(size_t num, size_t len) +dcalloc(size_t num, size_t size) { void *p; - if ((p = calloc(len, num)) == NULL) + if ((p = calloc(num, size)) == NULL) die(errno, "calloc"); return (p); } @@ -416,11 +416,9 @@ static inline char * dstrndup(const char *str, const size_t len) { char *p; - p = dcalloc(len + 1, 1); - strncpy(p, str, len); - if (p == NULL) - die(errno, "dstrndup"); + p = dcalloc(len + 1, sizeof(char)); + memcpy(p, str, len); return (p); } #endif |