import quincy beta 17.1.0

[ceph.git] / ceph / src / rocksdb / utilities / blob_db / blob_dump_tool.cc

diff --git a/ceph/src/rocksdb/utilities/blob_db/blob_dump_tool.cc b/ceph/src/rocksdb/utilities/blob_db/blob_dump_tool.cc
index 58f26128f8dafe08c45f29fb2cdeb616bccaaacb..8f425f730a0e8fef4437f6e5b362b510d196566d 100644 (file)
--- a/ceph/src/rocksdb/utilities/blob_db/blob_dump_tool.cc
+++ b/ceph/src/rocksdb/utilities/blob_db/blob_dump_tool.cc
@@ -101,7 +101,8 @@ Status BlobDumpTool::Read(uint64_t offset, size_t size, Slice* result) {
     }
     buffer_.reset(new char[buffer_size_]);
   }
-  Status s = reader_->Read(offset, size, result, buffer_.get());
+  Status s =
+      reader_->Read(IOOptions(), offset, size, result, buffer_.get(), nullptr);
   if (!s.ok()) {
     return s;
   }
@@ -254,7 +255,7 @@ void BlobDumpTool::DumpSlice(const Slice s, DisplayType type) {
         snprintf(buf + j * 3 + 16, 2, "%x", c & 0xf);
         snprintf(buf + j + 65, 2, "%c", (0x20 <= c && c <= 0x7e) ? c : '.');
       }
-      for (size_t p = 0; p < sizeof(buf) - 1; p++) {
+      for (size_t p = 0; p + 1 < sizeof(buf); p++) {
         if (buf[p] == 0) {
           buf[p] = ' ';
         }