Changeset - r21395:222aeff2f57d
[Not reviewed]
master
0 3 0
rubidium - 10 years ago 2014-04-24 17:40:43
rubidium@openttd.org
(svn r26494) -Codechange: replace some further usages of s(n)printf with seprintf
3 files changed with 20 insertions and 8 deletions:
0 comments (0 inline, 0 general)
src/script/squirrel.cpp
Show inline comments
 
@@ -19,7 +19,12 @@
 
#include <../squirrel/sqpcheader.h>
 
#include <../squirrel/sqvm.h>
 

	
 
/* 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.
 
 * Likewise for scstrcat. */
 
#include "../safeguards.h"
 
#undef snprintf
 
#undef strcat
 

	
 
void Squirrel::CompileError(HSQUIRRELVM vm, const SQChar *desc, const SQChar *source, SQInteger line, SQInteger column)
 
{
 
@@ -287,8 +292,9 @@ bool Squirrel::CallBoolMethod(HSQOBJECT 
 
	sq_pushroottable(vm);
 

	
 
	if (prepend_API_name) {
 
		char *class_name2 = (char *)alloca(strlen(class_name) + strlen(engine->GetAPIName()) + 1);
 
		sprintf(class_name2, "%s%s", engine->GetAPIName(), class_name);
 
		size_t len = strlen(class_name) + strlen(engine->GetAPIName()) + 1;
 
		char *class_name2 = (char *)alloca(len);
 
		seprintf(class_name2, class_name2 + len - 1, "%s%s", engine->GetAPIName(), class_name);
 

	
 
		sq_pushstring(vm, OTTD2SQ(class_name2), -1);
 
	} else {
src/script/squirrel_std.cpp
Show inline comments
 
@@ -17,7 +17,10 @@
 
#include "../core/alloc_func.hpp"
 
#include "../core/math_func.hpp"
 

	
 
/* Due to the different characters for Squirrel, the scstrcat might be a simple
 
 * strcat which triggers the safeguard. But it isn't always a simple strcat. */
 
#include "../safeguards.h"
 
#undef strcat
 

	
 

	
 
SQInteger SquirrelStd::min(HSQUIRRELVM vm)
src/settings.cpp
Show inline comments
 
@@ -1674,8 +1674,9 @@ void GetGRFPresetList(GRFPresetList *lis
 
 */
 
GRFConfig *LoadGRFPresetFromConfig(const char *config_name)
 
{
 
	char *section = (char*)alloca(strlen(config_name) + 8);
 
	sprintf(section, "preset-%s", config_name);
 
	size_t len = strlen(config_name) + 8;
 
	char *section = (char*)alloca(len);
 
	seprintf(section, section + len - 1, "preset-%s", config_name);
 

	
 
	IniFile *ini = IniLoadConfig();
 
	GRFConfig *config = GRFLoadConfig(ini, section, false);
 
@@ -1692,8 +1693,9 @@ GRFConfig *LoadGRFPresetFromConfig(const
 
 */
 
void SaveGRFPresetToConfig(const char *config_name, GRFConfig *config)
 
{
 
	char *section = (char*)alloca(strlen(config_name) + 8);
 
	sprintf(section, "preset-%s", config_name);
 
	size_t len = strlen(config_name) + 8;
 
	char *section = (char*)alloca(len);
 
	seprintf(section, section + len - 1, "preset-%s", config_name);
 

	
 
	IniFile *ini = IniLoadConfig();
 
	GRFSaveConfig(ini, section, config);
 
@@ -1707,8 +1709,9 @@ void SaveGRFPresetToConfig(const char *c
 
 */
 
void DeleteGRFPresetFromConfig(const char *config_name)
 
{
 
	char *section = (char*)alloca(strlen(config_name) + 8);
 
	sprintf(section, "preset-%s", config_name);
 
	size_t len = strlen(config_name) + 8;
 
	char *section = (char*)alloca(len);
 
	seprintf(section, section + len - 1, "preset-%s", config_name);
 

	
 
	IniFile *ini = IniLoadConfig();
 
	ini->RemoveGroup(section);
0 comments (0 inline, 0 general)