summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVictor Costan <costan@google.com>2021-01-25 17:02:58 +0000
committerVictor Costan <costan@google.com>2021-01-25 17:18:22 +0000
commit4a919ea4f7cf2b78bb1403e40b4888f592610c5a (patch)
tree64984fd50ec5738d9d8b29b5d147397af04dc564
parent1998c0ef15f0fb64994e165230473337f041fd8c (diff)
downloadleveldb-4a919ea4f7cf2b78bb1403e40b4888f592610c5a.tar.gz
IWYU fixes in db/c.cc.
Fixes https://github.com/google/leveldb/issues/872 PiperOrigin-RevId: 353657701
-rw-r--r--db/c.cc13
1 files changed, 8 insertions, 5 deletions
diff --git a/db/c.cc b/db/c.cc
index b5c9251..8bdde38 100644
--- a/db/c.cc
+++ b/db/c.cc
@@ -4,6 +4,8 @@
#include "leveldb/c.h"
+#include <string.h>
+
#include <cstdint>
#include <cstdlib>
@@ -119,7 +121,7 @@ struct leveldb_filterpolicy_t : public FilterPolicy {
size_t len;
char* filter = (*create_)(state_, &key_pointers[0], &key_sizes[0], n, &len);
dst->append(filter, len);
- free(filter);
+ std::free(filter);
}
bool KeyMayMatch(const Slice& key, const Slice& filter) const override {
@@ -150,14 +152,15 @@ static bool SaveError(char** errptr, const Status& s) {
*errptr = strdup(s.ToString().c_str());
} else {
// TODO(sanjay): Merge with existing error?
- free(*errptr);
+ std::free(*errptr);
*errptr = strdup(s.ToString().c_str());
}
return true;
}
static char* CopyString(const std::string& str) {
- char* result = reinterpret_cast<char*>(malloc(sizeof(char) * str.size()));
+ char* result =
+ reinterpret_cast<char*>(std::malloc(sizeof(char) * str.size()));
std::memcpy(result, str.data(), sizeof(char) * str.size());
return result;
}
@@ -547,13 +550,13 @@ char* leveldb_env_get_test_directory(leveldb_env_t* env) {
return nullptr;
}
- char* buffer = static_cast<char*>(malloc(result.size() + 1));
+ char* buffer = static_cast<char*>(std::malloc(result.size() + 1));
std::memcpy(buffer, result.data(), result.size());
buffer[result.size()] = '\0';
return buffer;
}
-void leveldb_free(void* ptr) { free(ptr); }
+void leveldb_free(void* ptr) { std::free(ptr); }
int leveldb_major_version() { return kMajorVersion; }