Change naming convention from _member to member_ (fixes #1905)

This commit is contained in:
Benoit Blanchon
2023-04-07 09:02:23 +02:00
parent 4ba9c1b0c0
commit 31ce648e63
64 changed files with 802 additions and 794 deletions

View File

@@ -10,36 +10,36 @@
class ArmoredAllocator {
public:
ArmoredAllocator() : _ptr(0), _size(0) {}
ArmoredAllocator() : ptr_(0), size_(0) {}
void* allocate(size_t size) {
_ptr = malloc(size);
_size = size;
return _ptr;
ptr_ = malloc(size);
size_ = size;
return ptr_;
}
void deallocate(void* ptr) {
REQUIRE(ptr == _ptr);
REQUIRE(ptr == ptr_);
free(ptr);
_ptr = 0;
_size = 0;
ptr_ = 0;
size_ = 0;
}
void* reallocate(void* ptr, size_t new_size) {
REQUIRE(ptr == _ptr);
REQUIRE(ptr == ptr_);
// don't call realloc, instead alloc a new buffer and erase the old one
// this way we make sure we support relocation
void* new_ptr = malloc(new_size);
memcpy(new_ptr, _ptr, std::min(new_size, _size));
memset(_ptr, '#', _size); // erase
free(_ptr);
_ptr = new_ptr;
memcpy(new_ptr, ptr_, std::min(new_size, size_));
memset(ptr_, '#', size_); // erase
free(ptr_);
ptr_ = new_ptr;
return new_ptr;
}
private:
void* _ptr;
size_t _size;
void* ptr_;
size_t size_;
};
typedef BasicJsonDocument<ArmoredAllocator> ShrinkToFitTestDocument;