gbdev/rgbds
1
0
Fork 0
mirror of https://github.com/gbdev/rgbds.git synced 2025-11-20 18:22:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use std::vector for RPN expressions

Browse Source
This commit is contained in:
Rangi42
2024-02-24 12:12:19 -05:00
committed by Sylvie
parent d792ee4b61
commit 5075ac8887
4 changed files with 39 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/link/object.cpp
View File

@@ -248,7 +248,7 @@ static void readSymbol(FILE *file, struct Symbol *symbol,
static void readPatch(FILE *file, struct Patch *patch, char const *fileName, char const *sectName,
uint32_t i, struct FileStackNode fileNodes[])
{
uint32_t nodeID;
uint32_t nodeID, rpnSize;
enum PatchType type;
tryReadlong(nodeID, file,
@@ -271,18 +271,15 @@ static void readPatch(FILE *file, struct Patch *patch, char const *fileName, cha
"%s: Unable to read \"%s\"'s patch #%" PRIu32 "'s type: %s",
fileName, sectName, i);
patch->type = type;
tryReadlong(patch->rpnSize, file,
tryReadlong(rpnSize, file,
"%s: Unable to read \"%s\"'s patch #%" PRIu32 "'s RPN size: %s",
fileName, sectName, i);
patch->rpnExpression = (uint8_t *)malloc(sizeof(*patch->rpnExpression) * patch->rpnSize);
if (!patch->rpnExpression)
err("%s: Failed to alloc \"%s\"'s patch #%" PRIu32 "'s RPN expression",
fileName, sectName, i);
size_t nbElementsRead = fread(patch->rpnExpression, sizeof(*patch->rpnExpression),
patch->rpnSize, file);
patch->rpnExpression.resize(rpnSize);
size_t nbElementsRead = fread(&patch->rpnExpression[0], sizeof(patch->rpnExpression[0]),
rpnSize, file);
if (nbElementsRead != patch->rpnSize)
if (nbElementsRead != rpnSize)
errx("%s: Cannot read \"%s\"'s patch #%" PRIu32 "'s RPN expression: %s",
fileName, sectName, i,
feof(file) ? "Unexpected end of file" : strerror(errno));
@@ -668,8 +665,6 @@ static void freeSection(struct Section *section)
free(section->name);
if (sect_HasData(section->type)) {
free(section->data);
for (struct Patch &patch : *section->patches)
free(patch.rpnExpression);
delete section->patches;
}
free(section->symbols);
@@ -706,8 +701,6 @@ void obj_Cleanup(void)
free(list.symbolList);
}
for (struct Assertion &assert : assertions) {
free(assert.patch.rpnExpression);
for (struct Assertion &assert : assertions)
free(assert.message);
}
}