dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

(svn r26506) -Codechange: replace most of vsnprintf with vseprintf

Browse Source
This commit is contained in:
rubidium
2014-04-24 19:51:45 +00:00
parent fad2d3c709
commit e61fe21237
14 changed files with 25 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/console.cpp
View File

@@ -137,7 +137,7 @@ void CDECL IConsolePrintF(TextColour colour_code, const char *format, ...)
char buf[ICON_MAX_STREAMSIZE]; char buf[ICON_MAX_STREAMSIZE];
va_start(va, format); va_start(va, format);
vsnprintf(buf, sizeof(buf), format, va); vseprintf(buf, lastof(buf), format, va);
va_end(va); va_end(va);
IConsolePrint(colour_code, buf); IConsolePrint(colour_code, buf);

2
src/debug.cpp
View File

@@ -163,7 +163,7 @@ void CDECL debug(const char *dbg, const char *format, ...)
va_list va; va_list va;
va_start(va, format); va_start(va, format);
vsnprintf(buf, lengthof(buf), format, va); vseprintf(buf, lastof(buf), format, va);
va_end(va); va_end(va);
debug_print(dbg, buf); debug_print(dbg, buf);

6
src/game/game_text.cpp
View File

@@ -31,7 +31,7 @@ void CDECL strgen_warning(const char *s, ...)
char buf[1024]; char buf[1024];
va_list va; va_list va;
va_start(va, s); va_start(va, s);
vsnprintf(buf, lengthof(buf), s, va); vseprintf(buf, lastof(buf), s, va);
va_end(va); va_end(va);
DEBUG(script, 0, "%s:%d: warning: %s", _file, _cur_line, buf); DEBUG(script, 0, "%s:%d: warning: %s", _file, _cur_line, buf);
_warnings++; _warnings++;
@@ -42,7 +42,7 @@ void CDECL strgen_error(const char *s, ...)
char buf[1024]; char buf[1024];
va_list va; va_list va;
va_start(va, s); va_start(va, s);
vsnprintf(buf, lengthof(buf), s, va); vseprintf(buf, lastof(buf), s, va);
va_end(va); va_end(va);
DEBUG(script, 0, "%s:%d: error: %s", _file, _cur_line, buf); DEBUG(script, 0, "%s:%d: error: %s", _file, _cur_line, buf);
_errors++; _errors++;
@@ -53,7 +53,7 @@ void NORETURN CDECL strgen_fatal(const char *s, ...)
char buf[1024]; char buf[1024];
va_list va; va_list va;
va_start(va, s); va_start(va, s);
vsnprintf(buf, lengthof(buf), s, va); vseprintf(buf, lastof(buf), s, va);
va_end(va); va_end(va);
DEBUG(script, 0, "%s:%d: FATAL: %s", _file, _cur_line, buf); DEBUG(script, 0, "%s:%d: FATAL: %s", _file, _cur_line, buf);
throw std::exception(); throw std::exception();

2
src/misc/str.hpp
View File

@@ -100,7 +100,7 @@ struct CStrA : public CBlobT<char>
int err = 0; int err = 0;
for (;;) { for (;;) {
char *buf = MakeFreeSpace(addSize); char *buf = MakeFreeSpace(addSize);
ret = vsnprintf(buf, base::GetReserve(), format, args); ret = vseprintf(buf, buf + base::GetReserve() - 1, format, args);
if (ret >= (int)base::GetReserve()) { if (ret >= (int)base::GetReserve()) {
/* Greater return than given count means needed buffer size. */ /* Greater return than given count means needed buffer size. */
addSize = ret + 1; addSize = ret + 1;

2
src/network/network_chat_gui.cpp
View File

@@ -86,7 +86,7 @@ void CDECL NetworkAddChatMessage(TextColour colour, uint duration, const char *m
va_list va; va_list va;
va_start(va, message); va_start(va, message);
vsnprintf(buf, lengthof(buf), message, va); vseprintf(buf, lastof(buf), message, va);
va_end(va); va_end(va);
Utf8TrimString(buf, DRAW_STRING_BUFFER); Utf8TrimString(buf, DRAW_STRING_BUFFER);

2
src/newgrf.cpp
View File

@@ -377,7 +377,7 @@ void CDECL grfmsg(int severity, const char *str, ...)
va_list va; va_list va;
va_start(va, str); va_start(va, str);
vsnprintf(buf, sizeof(buf), str, va); vseprintf(buf, lastof(buf), str, va);
va_end(va); va_end(va);
DEBUG(grf, severity, "[%s:%d] %s", _cur.grfconfig->filename, _cur.nfo_line, buf); DEBUG(grf, severity, "[%s:%d] %s", _cur.grfconfig->filename, _cur.nfo_line, buf);

2
src/newgrf_debug_gui.cpp
View File

@@ -400,7 +400,7 @@ struct NewGRFInspectWindow : Window {
va_list va; va_list va;
va_start(va, format); va_start(va, format);
vsnprintf(buf, lengthof(buf), format, va); vseprintf(buf, lastof(buf), format, va);
va_end(va); va_end(va);
offset -= this->vscroll->GetPosition(); offset -= this->vscroll->GetPosition();

6
src/openttd.cpp
View File

@@ -93,7 +93,7 @@ void CDECL usererror(const char *s, ...)
char buf[512]; char buf[512];
va_start(va, s); va_start(va, s);
vsnprintf(buf, lengthof(buf), s, va); vseprintf(buf, lastof(buf), s, va);
va_end(va); va_end(va);
ShowOSErrorBox(buf, false); ShowOSErrorBox(buf, false);
@@ -113,7 +113,7 @@ void CDECL error(const char *s, ...)
char buf[512]; char buf[512];
va_start(va, s); va_start(va, s);
vsnprintf(buf, lengthof(buf), s, va); vseprintf(buf, lastof(buf), s, va);
va_end(va); va_end(va);
ShowOSErrorBox(buf, true); ShowOSErrorBox(buf, true);
@@ -132,7 +132,7 @@ void CDECL ShowInfoF(const char *str, ...)
va_list va; va_list va;
char buf[1024]; char buf[1024];
va_start(va, str); va_start(va, str);
vsnprintf(buf, lengthof(buf), str, va); vseprintf(buf, lastof(buf), str, va);
va_end(va); va_end(va);
ShowInfo(buf); ShowInfo(buf);
} }

3
src/script/squirrel.cpp
View File

@@ -21,9 +21,10 @@
/* Due to the different characters for Squirrel, the scsnprintf might be a simple /* Due to the different characters for Squirrel, the scsnprintf might be a simple
* snprint which triggers the safeguard. But it isn't always a simple snprintf. * snprint which triggers the safeguard. But it isn't always a simple snprintf.
* Likewise for scstrcat. */ * Likewise for scvsnprintf and scstrcat. */
#include "../safeguards.h" #include "../safeguards.h"
#undef snprintf #undef snprintf
#undef vsnprintf
#undef strcat #undef strcat
void Squirrel::CompileError(HSQUIRRELVM vm, const SQChar *desc, const SQChar *source, SQInteger line, SQInteger column) void Squirrel::CompileError(HSQUIRRELVM vm, const SQChar *desc, const SQChar *source, SQInteger line, SQInteger column)

2
src/settingsgen/settingsgen.cpp
View File

@@ -42,7 +42,7 @@ void NORETURN CDECL error(const char *s, ...)
char buf[1024]; char buf[1024];
va_list va; va_list va;
va_start(va, s); va_start(va, s);
vsnprintf(buf, lengthof(buf), s, va); vseprintf(buf, lastof(buf), s, va);
va_end(va); va_end(va);
fprintf(stderr, "FATAL: %s\n", buf); fprintf(stderr, "FATAL: %s\n", buf);
exit(1); exit(1);

8
src/strgen/strgen.cpp
View File

@@ -53,7 +53,7 @@ void CDECL strgen_warning(const char *s, ...)
char buf[1024]; char buf[1024];
va_list va; va_list va;
va_start(va, s); va_start(va, s);
vsnprintf(buf, lengthof(buf), s, va); vseprintf(buf, lastof(buf), s, va);
va_end(va); va_end(va);
fprintf(stderr, LINE_NUM_FMT("warning"), _file, _cur_line, buf); fprintf(stderr, LINE_NUM_FMT("warning"), _file, _cur_line, buf);
_warnings++; _warnings++;
@@ -64,7 +64,7 @@ void CDECL strgen_error(const char *s, ...)
char buf[1024]; char buf[1024];
va_list va; va_list va;
va_start(va, s); va_start(va, s);
vsnprintf(buf, lengthof(buf), s, va); vseprintf(buf, lastof(buf), s, va);
va_end(va); va_end(va);
fprintf(stderr, LINE_NUM_FMT("error"), _file, _cur_line, buf); fprintf(stderr, LINE_NUM_FMT("error"), _file, _cur_line, buf);
_errors++; _errors++;
@@ -75,7 +75,7 @@ void NORETURN CDECL strgen_fatal(const char *s, ...)
char buf[1024]; char buf[1024];
va_list va; va_list va;
va_start(va, s); va_start(va, s);
vsnprintf(buf, lengthof(buf), s, va); vseprintf(buf, lastof(buf), s, va);
va_end(va); va_end(va);
fprintf(stderr, LINE_NUM_FMT("FATAL"), _file, _cur_line, buf); fprintf(stderr, LINE_NUM_FMT("FATAL"), _file, _cur_line, buf);
#ifdef _MSC_VER #ifdef _MSC_VER
@@ -89,7 +89,7 @@ void NORETURN CDECL error(const char *s, ...)
char buf[1024]; char buf[1024];
va_list va; va_list va;
va_start(va, s); va_start(va, s);
vsnprintf(buf, lengthof(buf), s, va); vseprintf(buf, lastof(buf), s, va);
va_end(va); va_end(va);
fprintf(stderr, LINE_NUM_FMT("FATAL"), _file, _cur_line, buf); fprintf(stderr, LINE_NUM_FMT("FATAL"), _file, _cur_line, buf);
#ifdef _MSC_VER #ifdef _MSC_VER

5
src/string.cpp
View File

@@ -32,7 +32,10 @@
#include "gfx_func.h" #include "gfx_func.h"
#endif /* WITH_ICU */ #endif /* WITH_ICU */
/* The function vsnprintf is used internally to perform the required formatting
* tasks. As such this one must be allowed, and makes sure it's terminated. */
#include "safeguards.h" #include "safeguards.h"
#undef vsnprintf
/** /**
* Safer implementation of vsnprintf; same as vsnprintf except: * Safer implementation of vsnprintf; same as vsnprintf except:
@@ -44,7 +47,7 @@
* @param ap the list of arguments for the format * @param ap the list of arguments for the format
* @return the number of added characters * @return the number of added characters
*/ */
static int CDECL vseprintf(char *str, const char *last, const char *format, va_list ap) int CDECL vseprintf(char *str, const char *last, const char *format, va_list ap)
{ {
ptrdiff_t diff = last - str; ptrdiff_t diff = last - str;
if (diff < 0) return 0; if (diff < 0) return 0;

1
src/string_func.h
View File

@@ -34,6 +34,7 @@ char *strecpy(char *dst, const char *src, const char *last);
char *stredup(const char *src, const char *last = NULL); char *stredup(const char *src, const char *last = NULL);
int CDECL seprintf(char *str, const char *last, const char *format, ...) WARN_FORMAT(3, 4); int CDECL seprintf(char *str, const char *last, const char *format, ...) WARN_FORMAT(3, 4);
int CDECL vseprintf(char *str, const char *last, const char *format, va_list ap);
char *CDECL str_fmt(const char *str, ...) WARN_FORMAT(1, 2); char *CDECL str_fmt(const char *str, ...) WARN_FORMAT(1, 2);

2
src/textbuf.cpp
View File

@@ -419,7 +419,7 @@ void Textbuf::Print(const char *format, ...)
{ {
va_list va; va_list va;
va_start(va, format); va_start(va, format);
vsnprintf(this->buf, this->max_bytes, format, va); vseprintf(this->buf, &this->buf[this->max_bytes - 1], format, va);
va_end(va); va_end(va);
this->UpdateSize(); this->UpdateSize();
} }