Fix trailing whitespace

[empserver] / src / lib / subs / nreport.c

diff --git a/src/lib/subs/nreport.c b/src/lib/subs/nreport.c
index aa47fc48698c1e135207dc1a038264ff3e729b02..2e833264948d4d6975affe74f8c8e30ecb1130ce 100644 (file)
--- a/src/lib/subs/nreport.c
+++ b/src/lib/subs/nreport.c
@@ -26,11 +26,12 @@
  *  ---
  *
  *  nreport.c: File a news report.  Downgrade relations if things get hostile.
- * 
+ *
  *  Known contributors to this file:
  *     Dave Pare, 1994
  *     Steve McClure, 1997
  *     Ron Koenderink, 2005
+ *     Markus Armbruster, 2004-2008
  */
 
 #include <config.h>
@@ -97,7 +98,7 @@ delete_old_news(void)
     /* skip over expired news */
     expiry_time = time(NULL) - days(news_keep_days);
     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;
     }
     /* news id 0..I-1 have expired */
@@ -108,9 +109,9 @@ delete_old_news(void)
 
     /* move unexpired news I.. to 0.., overwriting expired news */
     for (j = 0; getnews(i + j, &news); j++) {
-       if (news.nws_when == 0)
+       if (news.nws_vrb == 0)
            break;
-       news.nws_uid = j;
+       ef_set_uid(EF_NEWS, &news, j);
        putnews(j, &news);
     }
     CANT_HAPPEN(i + j != news_tail);
@@ -137,7 +138,7 @@ init_nreport(void)
     struct nwsstr news;
 
     for (newest_item = 0; getnews(newest_item, &news); newest_item++) {
-       if (news.nws_when == 0)
+       if (news.nws_vrb == 0)
            break;
     }
     news_tail = newest_item;
@@ -165,7 +166,7 @@ ncache(int actor, int event, int victim, int times)
            oldslot = i;
            oldtime = np->nws_when;
        }
-       if (np->nws_uid == 0)
+       if (np->nws_vrb == 0)
            continue;
        if (now - np->nws_when > minutes(5))
            continue;