From c3a5631ec7f2c0d82b87b42775d2595a37b3a1f6 Mon Sep 17 00:00:00 2001 From: Enno Rehling Date: Mon, 20 Aug 2007 16:32:27 +0000 Subject: [PATCH] fixed a couple of the strlcpy calls --- src/common/gamecode/report.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/common/gamecode/report.c b/src/common/gamecode/report.c index 1401d16d3..1fdc8c536 100644 --- a/src/common/gamecode/report.c +++ b/src/common/gamecode/report.c @@ -1348,15 +1348,15 @@ show_allies(FILE * F, const faction * f, const ally * allies, char * buf, size_t } } if (p!=MAXPARAMS) { - if (hh) strlcpy(bufp, ", ", size-(bufp-buf)); + if (hh) bufp += strlcpy(bufp, ", ", size-(bufp-buf)); bufp += strlcpy(bufp, parameters[p], size-(bufp-buf)); hh = 1; } } } - strlcpy(bufp, ")", size-(bufp-buf)); + bufp += strlcpy(bufp, ")", size-(bufp-buf)); } - strlcpy(bufp, ".", size-(bufp-buf)); + bufp += strlcpy(bufp, ".", size-(bufp-buf)); rparagraph(F, buf, 0, 0, 0); rnl(F); } @@ -1455,15 +1455,15 @@ guards(FILE * F, const region * r, const faction * see) for (i = 0; i!=nextguard+(tarned?1:0); ++i) { if (i!=0) { if (i == nextguard-(tarned?0:1)) - strlcpy(bufp, LOC(see->locale, "list_and"), sizeof(buf) - (bufp-buf)); + bufp += strlcpy(bufp, LOC(see->locale, "list_and"), sizeof(buf) - (bufp-buf)); else - strlcpy(bufp, ", ", sizeof(buf) - (bufp-buf)); + bufp += strlcpy(bufp, ", ", sizeof(buf) - (bufp-buf)); } - if (i