empire/empserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Make struct telstr members tel_type and tel_length unsigned

Browse source 
They are simpler to use that way.
This commit is contained in:
Markus Armbruster 2009-02-07 19:58:59 +01:00
parent d2cd46ce20
commit 4c81ca34cb
6 changed files with 23 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/lib/update/anno.c
View file

@ -118,14 +118,13 @@ copy_and_expire(FILE *annfp, FILE *tmpfp, char *tmp_filename,
while (fread(&tgm, sizeof(tgm), 1, annfp) == 1) {
writeit = 1;
if (tgm.tel_length < 0 || tgm.tel_length > MAXTELSIZE) {
logerror("bad telegram file header (length=%ld)",
if (tgm.tel_length > MAXTELSIZE) {
logerror("bad telegram file header (length=%d)",
tgm.tel_length);
return 0;
}
if (tgm.tel_type < 0 || tgm.tel_type > TEL_LAST) {
logerror("bad telegram file header (type=%d)",
tgm.tel_type);
if (tgm.tel_type > TEL_LAST) {
logerror("bad telegram file header (type=%d)", tgm.tel_type);
return 0;
}
@ -146,15 +145,14 @@ copy_and_expire(FILE *annfp, FILE *tmpfp, char *tmp_filename,
++saved;
} else
++deleted;
if (fread(message, 1, tgm.tel_length, annfp) !=
(size_t)tgm.tel_length) {
if (fread(message, 1, tgm.tel_length, annfp) != tgm.tel_length) {
logerror("error reading body from telegram file %s",
annfil);
return 0;
}
if (writeit) {
if (fwrite(message, 1, tgm.tel_length, tmpfp) !=
(size_t)tgm.tel_length) {
if (fwrite(message, 1, tgm.tel_length, tmpfp)
!= tgm.tel_length) {
logerror("error writing body to temporary telegram "
"file %s", tmp_filename);
return 0;