diff options
author | rubidium <rubidium@openttd.org> | 2014-04-23 21:12:09 +0000 |
---|---|---|
committer | rubidium <rubidium@openttd.org> | 2014-04-23 21:12:09 +0000 |
commit | 5b82822c12e014771dceaf9d909e1c0f3653c5a9 (patch) | |
tree | 1cf02e076eb61eb94d9064c7cb02bbe85ecb9a6c /src/settings.cpp | |
parent | ef4c2ce0317ae583e837722b6a41ea44cd83da71 (diff) | |
download | openttd-5b82822c12e014771dceaf9d909e1c0f3653c5a9.tar.xz |
(svn r26486) -Codechange: replace a number of snprintfs with seprintf
Diffstat (limited to 'src/settings.cpp')
-rw-r--r-- | src/settings.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/settings.cpp b/src/settings.cpp index 1a015c43c..c7d9e2b32 100644 --- a/src/settings.cpp +++ b/src/settings.cpp @@ -1537,7 +1537,7 @@ static void SaveVersionInConfig(IniFile *ini) IniGroup *group = ini->GetGroup("version"); char version[9]; - snprintf(version, lengthof(version), "%08X", _openttd_newgrf_version); + seprintf(version, lastof(version), "%08X", _openttd_newgrf_version); const char * const versions[][2] = { { "version_string", _openttd_revision }, @@ -2040,9 +2040,9 @@ void IConsoleGetSetting(const char *name, bool force_newgame) IConsolePrintF(CC_WARNING, "Current value for '%s' is: '%s'", name, (GetVarMemType(sd->save.conv) == SLE_VAR_STRQ) ? *(const char * const *)ptr : (const char *)ptr); } else { if (sd->desc.cmd == SDT_BOOLX) { - snprintf(value, sizeof(value), (*(const bool*)ptr != 0) ? "on" : "off"); + seprintf(value, lastof(value), (*(const bool*)ptr != 0) ? "on" : "off"); } else { - snprintf(value, sizeof(value), sd->desc.min < 0 ? "%d" : "%u", (int32)ReadValue(ptr, sd->save.conv)); + seprintf(value, lastof(value), sd->desc.min < 0 ? "%d" : "%u", (int32)ReadValue(ptr, sd->save.conv)); } IConsolePrintF(CC_WARNING, "Current value for '%s' is: '%s' (min: %s%d, max: %u)", @@ -2066,11 +2066,11 @@ void IConsoleListSettings(const char *prefilter) const void *ptr = GetVariableAddress(&GetGameSettings(), &sd->save); if (sd->desc.cmd == SDT_BOOLX) { - snprintf(value, lengthof(value), (*(const bool *)ptr != 0) ? "on" : "off"); + seprintf(value, lastof(value), (*(const bool *)ptr != 0) ? "on" : "off"); } else if (sd->desc.cmd == SDT_STRING) { - snprintf(value, sizeof(value), "%s", (GetVarMemType(sd->save.conv) == SLE_VAR_STRQ) ? *(const char * const *)ptr : (const char *)ptr); + seprintf(value, lastof(value), "%s", (GetVarMemType(sd->save.conv) == SLE_VAR_STRQ) ? *(const char * const *)ptr : (const char *)ptr); } else { - snprintf(value, lengthof(value), sd->desc.min < 0 ? "%d" : "%u", (int32)ReadValue(ptr, sd->save.conv)); + seprintf(value, lastof(value), sd->desc.min < 0 ? "%d" : "%u", (int32)ReadValue(ptr, sd->save.conv)); } IConsolePrintF(CC_DEFAULT, "%s = %s", sd->desc.name, value); } |