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

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.

1 files changed, 2 insertions, 4 deletions

diff --git a/misc_cmd.c b/misc_cmd.c
index 6d26c1d5c..865324acc 100644
--- a/misc_cmd.c
+++ b/misc_cmd.c
@@ -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();