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

Fix tests for unused news slots

Browse source 
delete_old_news() and init_nreport() tested for non-zero nws_when,
which is breaks for news at the epoch.  Not likely to happen, but
still wrong.

ncache() tested nws_uid, which breaks for the first entry in the news
file.  This made ncache() overlook that entry in the cache, and create
a new news item instead of incrementing nws_ntm.  Was always broken
that way.

Fix by testing nws_vrb instead.
This commit is contained in:
Markus Armbruster 2008-02-24 20:33:57 +01:00
parent 832574b6de
commit 5fda9462bd
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/lib/subs/nreport.c
View file

@ -97,7 +97,7 @@ delete_old_news(void)
/* skip over expired news */ /* skip over expired news */
expiry_time = time(NULL) - days(news_keep_days); expiry_time = time(NULL) - days(news_keep_days);
for (i = 0; getnews(i, &news); i++) { for (i = 0; getnews(i, &news); i++) {
if (news.nws_when == 0 || news.nws_when >= expiry_time) if (news.nws_vrb == 0 || news.nws_when >= expiry_time)
break; break;
} }
/* news id 0..I-1 have expired */ /* news id 0..I-1 have expired */
@ -108,7 +108,7 @@ delete_old_news(void)
/* move unexpired news I.. to 0.., overwriting expired news */ /* move unexpired news I.. to 0.., overwriting expired news */
for (j = 0; getnews(i + j, &news); j++) { for (j = 0; getnews(i + j, &news); j++) {
if (news.nws_when == 0) if (news.nws_vrb == 0)
break; break;
news.nws_uid = j; news.nws_uid = j;
putnews(j, &news); putnews(j, &news);
@ -137,7 +137,7 @@ init_nreport(void)
struct nwsstr news; struct nwsstr news;
for (newest_item = 0; getnews(newest_item, &news); newest_item++) { for (newest_item = 0; getnews(newest_item, &news); newest_item++) {
if (news.nws_when == 0) if (news.nws_vrb == 0)
break; break;
} }
news_tail = newest_item; news_tail = newest_item;
@ -165,7 +165,7 @@ ncache(int actor, int event, int victim, int times)
oldslot = i; oldslot = i;
oldtime = np->nws_when; oldtime = np->nws_when;
} }
if (np->nws_uid == 0) if (np->nws_vrb == 0)
continue; continue;
if (now - np->nws_when > minutes(5)) if (now - np->nws_when > minutes(5))
continue; continue;