Marc/server
1
0
Fork 0
forked from github/server
Code Issues Pull requests Projects Releases Wiki Activity

less of the "static buffer" warnings in travelthrough-reports

Browse source
This commit is contained in:
Enno Rehling 2008-08-18 16:47:05 +00:00
parent 1ebe955bbe
commit 9a037e2433
1 changed files with 16 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/common/gamecode/report.c
View file

@ -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;
}
}
}
}