From 9a037e24333a3416e5997568d121d260a29716dc Mon Sep 17 00:00:00 2001 From: Enno Rehling Date: Mon, 18 Aug 2008 16:47:05 +0000 Subject: [PATCH] less of the "static buffer" warnings in travelthrough-reports --- src/common/gamecode/report.c | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/src/common/gamecode/report.c b/src/common/gamecode/report.c index e9b7a9888..988008080 100644 --- a/src/common/gamecode/report.c +++ b/src/common/gamecode/report.c @@ -1262,19 +1262,31 @@ durchreisende(FILE * F, const region * r, const faction * f) } else { bytes = (int)strlcpy(bufp, "die ", size); } - if (wrptr(&bufp, &size, bytes)!=0) WARN_STATIC_BUFFER(); + if (wrptr(&bufp, &size, bytes)!=0) { + WARN_STATIC_BUFFER(); + break; + } bytes = (int)strlcpy(bufp, shipname(u->ship), size); } else { bytes = (int)strlcpy(bufp, unitname(u), size); } - if (wrptr(&bufp, &size, bytes)!=0) WARN_STATIC_BUFFER(); + if (wrptr(&bufp, &size, bytes)!=0) { + WARN_STATIC_BUFFER(); + break; + } if (counter + 1 < maxtravel) { bytes = (int)strlcpy(bufp, ", ", size); - if (wrptr(&bufp, &size, bytes)!=0) WARN_STATIC_BUFFER(); + if (wrptr(&bufp, &size, bytes)!=0) { + WARN_STATIC_BUFFER(); + break; + } } else if (counter + 1 == maxtravel) { bytes = (int)strlcpy(bufp, LOC(f->locale, "list_and"), size); - if (wrptr(&bufp, &size, bytes)!=0) WARN_STATIC_BUFFER(); + if (wrptr(&bufp, &size, bytes)!=0) { + WARN_STATIC_BUFFER(); + break; + } } } }