mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

Codechange: Use unique_ptr in MemoryDumper. (#12766) 

This replaces C-style manual memory management.
pull/12771/head
Peter Nelson 2024-06-08 21:59:56 +01:00 committed by GitHub
parent af7ad964dd
commit 79c1492a73
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 5 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/saveload/saveload.cpp
View File

@ -126,21 +126,9 @@ struct ReadBuffer {
/** Container for dumping the savegame (quickly) to memory. */ /** Container for dumping the savegame (quickly) to memory. */
struct MemoryDumper { struct MemoryDumper {
std::vector<uint8_t *> blocks; ///< Buffer with blocks of allocated memory. std::vector<std::unique_ptr<uint8_t[]>> blocks{}; ///< Buffer with blocks of allocated memory.
uint8_t *buf; ///< Buffer we're going to write to. uint8_t *buf = nullptr; ///< Buffer we're going to write to.
uint8_t *bufe; ///< End of the buffer we write to. uint8_t *bufe = nullptr; ///< End of the buffer we write to.
/** Initialise our variables. */
MemoryDumper() : buf(nullptr), bufe(nullptr)
{
}
~MemoryDumper()
{
for (auto p : this->blocks) {
free(p);
}
}
/** /**
* Write a single byte into the dumper. * Write a single byte into the dumper.
@ -150,8 +138,7 @@ struct MemoryDumper {
{ {
/* Are we at the end of this chunk? */ /* Are we at the end of this chunk? */
if (this->buf == this->bufe) { if (this->buf == this->bufe) {
this->buf = CallocT<uint8_t>(MEMORY_CHUNK_SIZE); this->buf = this->blocks.emplace_back(std::make_unique<uint8_t[]>(MEMORY_CHUNK_SIZE)).get();
this->blocks.push_back(this->buf);
this->bufe = this->buf + MEMORY_CHUNK_SIZE; this->bufe = this->buf + MEMORY_CHUNK_SIZE;
} }
@ -170,7 +157,7 @@ struct MemoryDumper {
while (t > 0) { while (t > 0) {
size_t to_write = std::min(MEMORY_CHUNK_SIZE, t); size_t to_write = std::min(MEMORY_CHUNK_SIZE, t);
writer->Write(this->blocks[i++], to_write); writer->Write(this->blocks[i++].get(), to_write);
t -= to_write; t -= to_write;
} }