From f062187e4709cd13b3001665d1b48cfe36150e8e Mon Sep 17 00:00:00 2001 From: tron Date: Wed, 12 Jan 2005 21:38:49 +0000 Subject: [PATCH] (svn r1492) Reduce strcpy(, "") follwed by strcat() to just strcpy() (Jango) --- namegen.c | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/namegen.c b/namegen.c index d9480a987b..e6fee0daa5 100644 --- a/namegen.c +++ b/namegen.c @@ -184,22 +184,19 @@ static byte MakeGermanTownName(byte *buf, uint32 seed) static byte MakeSpanishTownName(byte *buf, uint32 seed) { - strcpy(buf, ""); - strcat(buf, name_spanish_1[GetNumberBasedOnSeed(0, lengthof(name_spanish_1), seed)]); + strcpy(buf, name_spanish_1[GetNumberBasedOnSeed(0, lengthof(name_spanish_1), seed)]); return 0; } static byte MakeFrenchTownName(byte *buf, uint32 seed) { - strcpy(buf, ""); - strcat(buf, name_french_1[GetNumberBasedOnSeed(0, lengthof(name_french_1), seed)]); + strcpy(buf, name_french_1[GetNumberBasedOnSeed(0, lengthof(name_french_1), seed)]); return 0; } static byte MakeSillyTownName(byte *buf, uint32 seed) { - strcpy(buf, ""); - strcat(buf, name_silly_1[GetNumberBasedOnSeed( 0, lengthof(name_silly_1), seed)]); + strcpy(buf, name_silly_1[GetNumberBasedOnSeed( 0, lengthof(name_silly_1), seed)]); strcat(buf, name_silly_2[GetNumberBasedOnSeed(16, lengthof(name_silly_2), seed)]); return 0; } @@ -316,22 +313,19 @@ static byte MakePolishTownName(byte *buf, uint32 seed) static byte MakeCzechTownName(byte *buf, uint32 seed) { - strcpy(buf, ""); - strcat(buf, name_czech_1[GetNumberBasedOnSeed(0, lengthof(name_czech_1), seed)]); + strcpy(buf, name_czech_1[GetNumberBasedOnSeed(0, lengthof(name_czech_1), seed)]); return 0; } static byte MakeRomanianTownName(byte *buf, uint32 seed) { - strcpy(buf, ""); - strcat(buf, name_romanian_1[GetNumberBasedOnSeed(0, lengthof(name_romanian_1), seed)]); + strcpy(buf, name_romanian_1[GetNumberBasedOnSeed(0, lengthof(name_romanian_1), seed)]); return 0; } static byte MakeSlovakTownName(byte *buf, uint32 seed) { - strcpy(buf, ""); - strcat(buf, name_slovakish_1[GetNumberBasedOnSeed(0, lengthof(name_slovakish_1), seed)]); + strcpy(buf, name_slovakish_1[GetNumberBasedOnSeed(0, lengthof(name_slovakish_1), seed)]); return 0; }