mirror of
https://github.com/gbdev/rgbds.git
synced 2025-11-20 10:12:06 +00:00
Get rid of some fixed-size char buffers
This commit is contained in:
@@ -356,11 +356,8 @@ void fstk_RunMacro(char const *macroName, MacroArgs &args) {
|
||||
std::vector<uint32_t> const &srcIters = macro->src->iters();
|
||||
|
||||
for (uint32_t i = srcIters.size(); i--;) {
|
||||
char buf[sizeof("::REPT~4294967295")]; // UINT32_MAX
|
||||
|
||||
if (sprintf(buf, "::REPT~%" PRIu32, srcIters[i]) < 0)
|
||||
fatalerror("Failed to write macro invocation info: %s\n", strerror(errno));
|
||||
fileInfoName.append(buf);
|
||||
fileInfoName.append("::REPT~");
|
||||
fileInfoName.append(std::to_string(srcIters[i]));
|
||||
}
|
||||
}
|
||||
fileInfoName.append("::");
|
||||
|
||||
@@ -462,10 +462,9 @@ static void readAssertion(
|
||||
uint32_t i,
|
||||
std::vector<FileStackNode> const &fileNodes
|
||||
) {
|
||||
char assertName[sizeof("Assertion #4294967295")]; // UINT32_MAX
|
||||
|
||||
snprintf(assertName, sizeof(assertName), "Assertion #%" PRIu32, i);
|
||||
std::string assertName("Assertion #");
|
||||
|
||||
assertName += std::to_string(i);
|
||||
readPatch(file, assert.patch, fileName, assertName, 0, fileNodes);
|
||||
tryReadstring(assert.message, file, "%s: Cannot read assertion's message: %s", fileName);
|
||||
}
|
||||
|
||||
@@ -349,17 +349,13 @@ static char *execProg(char const *name, char * const *argv) {
|
||||
return buf;
|
||||
};
|
||||
|
||||
char cmdLine[32768]; // Max command line size on Windows
|
||||
char *ptr = cmdLine;
|
||||
std::vector<char> cmdLine;
|
||||
for (size_t i = 0; argv[i]; ++i) {
|
||||
char const *src = argv[i];
|
||||
// I miss you, `stpcpy`
|
||||
while (*src) {
|
||||
*ptr++ = *src++;
|
||||
}
|
||||
*ptr++ = ' ';
|
||||
if (i > 0)
|
||||
cmdLine.push_back(' ');
|
||||
cmdLine.insert(cmdLine.end(), argv[i], argv[i] + strlen(argv[i]));
|
||||
}
|
||||
*ptr = '\0';
|
||||
cmdLine.push_back('\0');
|
||||
|
||||
STARTUPINFOA startupInfo;
|
||||
GetStartupInfoA(&startupInfo);
|
||||
@@ -386,7 +382,16 @@ static char *execProg(char const *name, char * const *argv) {
|
||||
|
||||
PROCESS_INFORMATION child;
|
||||
if (CreateProcessA(
|
||||
nullptr, cmdLine, nullptr, nullptr, true, 0, nullptr, nullptr, &childStartupInfo, &child
|
||||
nullptr,
|
||||
cmdLine.data(),
|
||||
nullptr,
|
||||
nullptr,
|
||||
true,
|
||||
0,
|
||||
nullptr,
|
||||
nullptr,
|
||||
&childStartupInfo,
|
||||
&child
|
||||
)
|
||||
== 0) {
|
||||
return winStrerror(GetLastError());
|
||||
|
||||
Reference in New Issue
Block a user