AxioDL
/
metaforce
mirror of https://github.com/AxioDL/metaforce.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

DNAMP3/PAK: Make use of unique_ptr in getBuffer() 

Same motivation as the previous change: seating the allocated memory
into a type that will always do the right thing immediately, rather than
later.
This commit is contained in:
Lioncash 2020-04-05 10:20:57 -04:00
parent 9e503edaf1
commit fa2f37a14c
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
DataSpec/DNAMP3/PAK.cpp
View File

@ -142,7 +142,7 @@ std::unique_ptr<atUint8[]> PAK::Entry::getBuffer(const nod::Node& pak, atUint64&
strm->read(&head, 8); strm->read(&head, 8);
if (head.magic != CMPD) { if (head.magic != CMPD) {
Log.report(logvisor::Error, fmt("invalid CMPD block")); Log.report(logvisor::Error, fmt("invalid CMPD block"));
return std::unique_ptr<atUint8[]>(); return nullptr;
} }
head.blockCount = hecl::SBig(head.blockCount); head.blockCount = hecl::SBig(head.blockCount);
@ -165,8 +165,8 @@ std::unique_ptr<atUint8[]> PAK::Entry::getBuffer(const nod::Node& pak, atUint64&
} }
std::unique_ptr<atUint8[]> compBuf(new atUint8[maxBlockSz]); std::unique_ptr<atUint8[]> compBuf(new atUint8[maxBlockSz]);
atUint8* buf = new atUint8[totalDecompSz]; std::unique_ptr<atUint8[]> buf{new atUint8[totalDecompSz]};
atUint8* bufCur = buf; atUint8* bufCur = buf.get();
for (atUint32 b = 0; b < head.blockCount; ++b) { for (atUint32 b = 0; b < head.blockCount; ++b) {
Block& block = blocks[b]; Block& block = blocks[b];
atUint8* compBufCur = compBuf.get(); atUint8* compBufCur = compBuf.get();
@ -189,12 +189,12 @@ std::unique_ptr<atUint8[]> PAK::Entry::getBuffer(const nod::Node& pak, atUint64&
} }
szOut = totalDecompSz; szOut = totalDecompSz;
return std::unique_ptr<atUint8[]>(buf); return buf;
} else { } else {
atUint8* buf = new atUint8[size]; std::unique_ptr<atUint8[]> buf{new atUint8[size]};
pak.beginReadStream(offset)->read(buf, size); pak.beginReadStream(offset)->read(buf.get(), size);
szOut = size; szOut = size;
return std::unique_ptr<atUint8[]>(buf); return buf;
} }
} }