diff options
| author | frosch <frosch@openttd.org> | 2014-04-23 20:44:42 +0000 |
|---|---|---|
| committer | frosch <frosch@openttd.org> | 2014-04-23 20:44:42 +0000 |
| commit | ef4c2ce0317ae583e837722b6a41ea44cd83da71 (patch) | |
| tree | c0c3d77ac495a6b9257cd7de4dadc6712db1acc8 /src/settings.cpp | |
| parent | 56e8ea6ddef08eb6ad1a28d06dddecb902e1bc04 (diff) | |
| download | openttd-ef4c2ce0317ae583e837722b6a41ea44cd83da71.tar.xz | |
(svn r26485) -Codechange: Replace ttd_strlcpy and ttd_strlcat with strecpy and strecat.
Diffstat (limited to 'src/settings.cpp')
| -rw-r--r-- | src/settings.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/settings.cpp b/src/settings.cpp index b5fcbc670..1a015c43c 100644 --- a/src/settings.cpp +++ b/src/settings.cpp @@ -526,7 +526,7 @@ static void IniLoadSettings(IniFile *ini, const SettingDesc *sd, const char *grp switch (GetVarMemType(sld->conv)) { case SLE_VAR_STRB: case SLE_VAR_STRBQ: - if (p != NULL) ttd_strlcpy((char*)ptr, (const char*)p, sld->length); + if (p != NULL) strecpy((char*)ptr, (const char*)p, (char*)ptr + sld->length - 1); break; case SLE_VAR_STR: @@ -1929,7 +1929,7 @@ bool SetSettingValue(uint index, const char *value, bool force_newgame) *var = strcmp(value, "(null)") == 0 ? NULL : strdup(value); } else { char *var = (char*)GetVariableAddress(NULL, &sd->save); - ttd_strlcpy(var, value, sd->save.length); + strecpy(var, value, &var[sd->save.length - 1]); } if (sd->desc.proc != NULL) sd->desc.proc(0); |