Merge #10: Clean up compile-time warnings (gcc 7.1)

0ec2a34 Clean up compile-time warnings (gcc 7.1) (Matt Corallo) Pull request description: * max_file_size was already a size_t, so return that. * ecx was somehow being listed as used-uninitialized Tree-SHA512: 6aeb9d6ce343d27c00338a379e6f359a6591e06fda978204133b9f81d817d99d4e4fcb7c851cf366276ef0171cfe77fa5765d836014dd6f213653ac53420d121
hebasto · Jul 31, 2017 · fceb805 · fceb805
2 parents d4c268a + 0ec2a34
commit fceb805
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/db/memtable.cc b/db/memtable.cc
@@ -101,7 +101,7 @@ void MemTable::Add(SequenceNumber s, ValueType type,
   p += 8;
   p = EncodeVarint32(p, val_size);
   memcpy(p, value.data(), val_size);
-  assert((p + val_size) - buf == encoded_len);
+  assert(p + val_size == buf + encoded_len);
   table_.Insert(buf);
 }
 

diff --git a/db/version_set.cc b/db/version_set.cc
@@ -20,7 +20,7 @@
 
 namespace leveldb {
 
-static int TargetFileSize(const Options* options) {
+static size_t TargetFileSize(const Options* options) {
   return options->max_file_size;
 }
 

diff --git a/util/logging.cc b/util/logging.cc
@@ -49,7 +49,7 @@ bool ConsumeDecimalNumber(Slice* in, uint64_t* val) {
   uint64_t v = 0;
   int digits = 0;
   while (!in->empty()) {
-    char c = (*in)[0];
+    unsigned char c = (*in)[0];
     if (c >= '0' && c <= '9') {
       ++digits;
       const int delta = (c - '0');