diff options
| author | Keith Bostic <keith.bostic@mongodb.com> | 2016-01-22 08:45:57 -0500 |
|---|---|---|
| committer | Keith Bostic <keith.bostic@mongodb.com> | 2016-01-22 08:45:57 -0500 |
| commit | 0f710425ba5ad4a37cda70f19954f1113531f7c3 (patch) | |
| tree | d18bc6dabb67e0aecd91bf98cf2c389c718aa3c5 | |
| parent | cd1aef20bfb5c4ee32177f59631099e7da577cc5 (diff) | |
| parent | 7f404e15f160863f79a1f5e058ed1bb37f252a01 (diff) | |
| download | mongo-0f710425ba5ad4a37cda70f19954f1113531f7c3.tar.gz | |
Merge pull request #2457 from wiredtiger/WT-2344
WT-2344: OS X compiler warning
| -rw-r--r-- | bench/wtperf/idle_table_cycle.c | 6 | ||||
| -rw-r--r-- | dist/s_string.ok | 1 | ||||
| -rw-r--r-- | src/btree/bt_rebalance.c | 2 |
3 files changed, 5 insertions, 4 deletions
diff --git a/bench/wtperf/idle_table_cycle.c b/bench/wtperf/idle_table_cycle.c index d80508a843e..b699b5b9dd1 100644 --- a/bench/wtperf/idle_table_cycle.c +++ b/bench/wtperf/idle_table_cycle.c @@ -67,8 +67,8 @@ cycle_idle_tables(void *arg) CONFIG *cfg; WT_SESSION *session; WT_CURSOR *cursor; - char uri[512]; int cycle_count, ret; + char uri[512]; cfg = (CONFIG *)arg; cycle_count = 0; @@ -148,9 +148,9 @@ cycle_idle_tables(void *arg) /* * Start a thread the creates and drops tables regularly. * TODO: Currently accepts a pthread_t as a parameter, since it is not - * possible to portably staticially initialize it in the global configuration + * possible to portably statically initialize it in the global configuration * structure. Should reshuffle the configuration structure so explicit static - * initializers aren't necessary. + * initialization isn't necessary. */ int start_idle_table_cycle(CONFIG *cfg, pthread_t *idle_table_cycle_thread) diff --git a/dist/s_string.ok b/dist/s_string.ok index d4af6b8eb00..b2d5a453441 100644 --- a/dist/s_string.ok +++ b/dist/s_string.ok @@ -831,6 +831,7 @@ perf pfx poptable popthreads +portably pos posint posix diff --git a/src/btree/bt_rebalance.c b/src/btree/bt_rebalance.c index f44a5ea361f..86360e83ddf 100644 --- a/src/btree/bt_rebalance.c +++ b/src/btree/bt_rebalance.c @@ -141,7 +141,7 @@ __rebalance_internal(WT_SESSION_IMPL *session, WT_REBALANCE_STUFF *rs) */ if (rs->leaf_next > UINT32_MAX) WT_RET_MSG(session, ENOTSUP, - "too many leaf pages to rebalance, %" PRIu64 " pages " + "too many leaf pages to rebalance, %" WT_SIZET_FMT " pages " "exceeds the maximum of %" PRIu32, rs->leaf_next, UINT32_MAX); leaf_next = (uint32_t)rs->leaf_next; |