Merge src/leveldb changes for LevelDB 1.18.

2014-10-16 12:23:50 -07:00
parent e8f6d54f1f 4b0e2d75d7
commit 5b9f8425a5
40 changed files with 602 additions and 282 deletions
--- a/src/leveldb/util/logging.cc
+++ b/src/leveldb/util/logging.cc
@@ -45,15 +45,6 @@ std::string EscapeString(const Slice& value) {
  return r;
 }

-bool ConsumeChar(Slice* in, char c) {
-  if (!in->empty() && (*in)[0] == c) {
-    in->remove_prefix(1);
-    return true;
-  } else {
-    return false;
-  }
-}
-
 bool ConsumeDecimalNumber(Slice* in, uint64_t* val) {
  uint64_t v = 0;
  int digits = 0;