mirror/OpenTTD
1
0
Fork 1
mirror of https://github.com/OpenTTD/OpenTTD.git synced 2025-08-20 04:59:11 +00:00
Code Issues Activity

Codechange: replace error/usererror printf variant with fmt variant and rename

Browse Source
This commit is contained in:
Rubidium
2023-04-19 22:47:36 +02:00
committed by rubidium42
parent 43c65a3fec
commit f74e26ca7e
39 changed files with 176 additions and 131 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/settingsgen/CMakeLists.txt
View File

@@ -7,6 +7,7 @@ if (NOT HOST_BINARY_DIR)
settingsgen.cpp
../core/alloc_func.cpp
../misc/getoptdata.cpp
../error.cpp
../ini_load.cpp
../string.cpp
)

18
src/settingsgen/settingsgen.cpp
View File

@@ -13,8 +13,7 @@
#include "../misc/getoptdata.h"
#include "../ini_type.h"
#include "../core/smallvec_type.hpp"
#include <stdarg.h>
#include "../error_func.h"
#if !defined(_WIN32) || defined(__CYGWIN__)
#include <unistd.h>
@@ -28,14 +27,9 @@
* @param s Format string.
* @note Function does not return.
*/
void NORETURN CDECL error(const char *s, ...)
void NORETURN FatalErrorI(const std::string &msg)
{
char buf[1024];
va_list va;
va_start(va, s);
vseprintf(buf, lastof(buf), s, va);
va_end(va);
fprintf(stderr, "FATAL: %s\n", buf);
fprintf(stderr, "FATAL: %s\n", msg.c_str());
exit(1);
}
@@ -181,7 +175,7 @@ struct SettingsIniFile : IniLoadFile {
virtual void ReportFileError(const char * const pre, const char * const buffer, const char * const post)
{
error("%s%s%s", pre, buffer, post);
FatalError("{}{}{}", pre, buffer, post);
}
};
@@ -385,7 +379,7 @@ static bool CompareFiles(const char *n1, const char *n2)
FILE *f1 = fopen(n1, "rb");
if (f1 == nullptr) {
fclose(f2);
error("can't open %s", n1);
FatalError("can't open {}", n1);
}
size_t l1, l2;
@@ -530,7 +524,7 @@ int CDECL main(int argc, char *argv[])
#if defined(_WIN32)
unlink(output_file);
#endif
if (rename(tmp_output, output_file) == -1) error("rename() failed");
if (rename(tmp_output, output_file) == -1) FatalError("rename() failed");
}
}
return 0;