Commit 493f05d7 authored by John Esmet's avatar John Esmet

FT-288 Fix warn-uninitialized errors found by gcc 4.9

parent 496317f2
...@@ -660,11 +660,11 @@ toku_deserialize_ft_from(int fd, ...@@ -660,11 +660,11 @@ toku_deserialize_ft_from(int fd,
{ {
struct rbuf rb_0; struct rbuf rb_0;
struct rbuf rb_1; struct rbuf rb_1;
uint64_t checkpoint_count_0; uint64_t checkpoint_count_0 = 0;
uint64_t checkpoint_count_1; uint64_t checkpoint_count_1 = 0;
LSN checkpoint_lsn_0; LSN checkpoint_lsn_0;
LSN checkpoint_lsn_1; LSN checkpoint_lsn_1;
uint32_t version_0, version_1, version = 0; uint32_t version_0 = 0, version_1 = 0, version = 0;
bool h0_acceptable = false; bool h0_acceptable = false;
bool h1_acceptable = false; bool h1_acceptable = false;
struct rbuf *rb = NULL; struct rbuf *rb = NULL;
......
...@@ -197,7 +197,7 @@ toku_maybe_preallocate_in_file (int fd, int64_t size, int64_t expected_size, int ...@@ -197,7 +197,7 @@ toku_maybe_preallocate_in_file (int fd, int64_t size, int64_t expected_size, int
// Effect: make the file bigger by either doubling it or growing by 16MiB whichever is less, until it is at least size // Effect: make the file bigger by either doubling it or growing by 16MiB whichever is less, until it is at least size
// Return 0 on success, otherwise an error number. // Return 0 on success, otherwise an error number.
{ {
int64_t file_size; int64_t file_size = 0;
//TODO(yoni): Allow variable stripe_width (perhaps from ft) for larger raids //TODO(yoni): Allow variable stripe_width (perhaps from ft) for larger raids
const uint64_t stripe_width = 4096; const uint64_t stripe_width = 4096;
{ {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment