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

(svn r1616) Introduce ttd_strlcat() and use it to de-uglify some piece of code in misc_cmd.

Browse Source 
While here rename the len parameter of ttd_strlcpy() to size, because it is a buffer size and not a string length.
Also add -Wwrite-strings to the Makefile, because the above mentioned piece of code was the only part which triggered this warning.
This commit is contained in:
tron
2005-01-23 15:16:47 +00:00
parent 9a96f5b64e
commit 53d1c3f117
4 changed files with 18 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
misc_cmd.c
View File

@@ -158,10 +158,8 @@ int32 CmdChangePresidentName(int x, int y, uint32 flags, uint32 p1, uint32 p2)
DeleteName(old_str);
if (p->name_1 == STR_SV_UNNAMED) {
byte *s = " Transport";
byte *d = (byte*)_decode_parameters, b;
d--; do d++; while (*d);
do *d++ = b = *s++; while(d != (byte*)endof(_decode_parameters) && b != 0);
ttd_strlcat(
(char*)_decode_parameters, " Transport", sizeof(_decode_parameters));
DoCommandByTile(0, p1, 0, DC_EXEC, CMD_CHANGE_COMPANY_NAME);
}
MarkWholeScreenDirty();