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

Codechange: move to std::string over stredup + free

pull/11044/head
Rubidium 2023-06-18 21:30:25 +02:00 committed by rubidium42
parent 2a2443dd01
commit 714ff35e9d
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/os/windows/win32_main.cpp
View File

@ -58,10 +58,8 @@ int APIENTRY WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLi
CrashLog::InitialiseCrashLog(); CrashLog::InitialiseCrashLog();
/* Convert the command line to UTF-8. We need a dedicated buffer /* Convert the command line to UTF-8. */
* for this because argv[] points into this buffer and this needs to std::string cmdline = FS2OTTD(GetCommandLine());
* be available between subsequent calls to FS2OTTD(). */
char *cmdline = stredup(FS2OTTD(GetCommandLine()).c_str());
/* Set the console codepage to UTF-8. */ /* Set the console codepage to UTF-8. */
SetConsoleOutputCP(CP_UTF8); SetConsoleOutputCP(CP_UTF8);
@ -76,7 +74,7 @@ int APIENTRY WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLi
SetRandomSeed(GetTickCount()); SetRandomSeed(GetTickCount());
char *argv[64]; // max 64 command line arguments char *argv[64]; // max 64 command line arguments
int argc = ParseCommandLine(cmdline, argv, lengthof(argv)); int argc = ParseCommandLine(cmdline.data(), argv, lengthof(argv));
/* Make sure our arguments contain only valid UTF-8 characters. */ /* Make sure our arguments contain only valid UTF-8 characters. */
for (int i = 0; i < argc; i++) StrMakeValidInPlace(argv[i]); for (int i = 0; i < argc; i++) StrMakeValidInPlace(argv[i]);
@ -86,6 +84,5 @@ int APIENTRY WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLi
/* Restore system timer resolution. */ /* Restore system timer resolution. */
timeEndPeriod(1); timeEndPeriod(1);
free(cmdline);
return ret; return ret;
} }