|
4 | 4 |
|
5 | 5 | #include "leveldb/c.h"
|
6 | 6 |
|
| 7 | +#include <string.h> |
| 8 | + |
7 | 9 | #include <cstdint>
|
8 | 10 | #include <cstdlib>
|
9 | 11 |
|
@@ -119,7 +121,7 @@ struct leveldb_filterpolicy_t : public FilterPolicy {
|
119 | 121 | size_t len;
|
120 | 122 | char* filter = (*create_)(state_, &key_pointers[0], &key_sizes[0], n, &len);
|
121 | 123 | dst->append(filter, len);
|
122 |
| - free(filter); |
| 124 | + std::free(filter); |
123 | 125 | }
|
124 | 126 |
|
125 | 127 | bool KeyMayMatch(const Slice& key, const Slice& filter) const override {
|
@@ -150,14 +152,15 @@ static bool SaveError(char** errptr, const Status& s) {
|
150 | 152 | *errptr = strdup(s.ToString().c_str());
|
151 | 153 | } else {
|
152 | 154 | // TODO(sanjay): Merge with existing error?
|
153 |
| - free(*errptr); |
| 155 | + std::free(*errptr); |
154 | 156 | *errptr = strdup(s.ToString().c_str());
|
155 | 157 | }
|
156 | 158 | return true;
|
157 | 159 | }
|
158 | 160 |
|
159 | 161 | static char* CopyString(const std::string& str) {
|
160 |
| - char* result = reinterpret_cast<char*>(malloc(sizeof(char) * str.size())); |
| 162 | + char* result = |
| 163 | + reinterpret_cast<char*>(std::malloc(sizeof(char) * str.size())); |
161 | 164 | std::memcpy(result, str.data(), sizeof(char) * str.size());
|
162 | 165 | return result;
|
163 | 166 | }
|
@@ -547,13 +550,13 @@ char* leveldb_env_get_test_directory(leveldb_env_t* env) {
|
547 | 550 | return nullptr;
|
548 | 551 | }
|
549 | 552 |
|
550 |
| - char* buffer = static_cast<char*>(malloc(result.size() + 1)); |
| 553 | + char* buffer = static_cast<char*>(std::malloc(result.size() + 1)); |
551 | 554 | std::memcpy(buffer, result.data(), result.size());
|
552 | 555 | buffer[result.size()] = '\0';
|
553 | 556 | return buffer;
|
554 | 557 | }
|
555 | 558 |
|
556 |
| -void leveldb_free(void* ptr) { free(ptr); } |
| 559 | +void leveldb_free(void* ptr) { std::free(ptr); } |
557 | 560 |
|
558 | 561 | int leveldb_major_version() { return kMajorVersion; }
|
559 | 562 |
|
|
0 commit comments