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

Factor out a common strlen into beginExpansion

Browse Source 
This avoids the possibility of `size` not matching `str`
This commit is contained in:
Rangi
2021-03-31 14:41:38 -04:00
parent 363b3d0134
commit 596e17ee61
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/asm/lexer.c
View File

@@ -747,10 +747,11 @@ static struct Expansion *getExpansionAtDistance(size_t *distance)
return expansion; return expansion;
} }
static void beginExpansion(size_t distance, uint8_t skip, static void beginExpansion(size_t distance, uint8_t skip, char const *str, bool owned,
char const *str, size_t size, bool owned,
char const *name) char const *name)
{ {
size_t size = strlen(str);
/* Do not expand empty strings */ /* Do not expand empty strings */
if (!size) if (!size)
return; return;
@@ -929,7 +930,7 @@ restart:
goto restart; goto restart;
} }
beginExpansion(distance, 2, str, strlen(str), c == '#', NULL); beginExpansion(distance, 2, str, c == '#', NULL);
/* /*
* Assuming macro args can't be recursive (I'll be damned if a way * Assuming macro args can't be recursive (I'll be damned if a way
@@ -949,7 +950,7 @@ restart:
char const *ptr = readInterpolation(); char const *ptr = readInterpolation();
if (ptr) { if (ptr) {
beginExpansion(distance, 0, ptr, strlen(ptr), false, ptr); beginExpansion(distance, 0, ptr, false, ptr);
goto restart; goto restart;
} }
} }
@@ -1418,7 +1419,7 @@ static char const *readInterpolation(void)
char const *ptr = readInterpolation(); char const *ptr = readInterpolation();
if (ptr) { if (ptr) {
beginExpansion(0, 0, ptr, strlen(ptr), false, ptr); beginExpansion(0, 0, ptr, false, ptr);
continue; /* Restart, reading from the new buffer */ continue; /* Restart, reading from the new buffer */
} }
} else if (c == EOF || c == '\r' || c == '\n' || c == '"') { } else if (c == EOF || c == '\r' || c == '\n' || c == '"') {
@@ -2100,8 +2101,7 @@ static int yylex_NORMAL(void)
if (sym && sym->type == SYM_EQUS) { if (sym && sym->type == SYM_EQUS) {
char const *s = sym_GetStringValue(sym); char const *s = sym_GetStringValue(sym);
beginExpansion(0, 0, s, strlen(s), false, beginExpansion(0, 0, s, false, sym->name);
sym->name);
continue; /* Restart, reading from the new buffer */ continue; /* Restart, reading from the new buffer */
} }
} }