X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=innduct.git;a=blobdiff_plain;f=xmit.c;h=c4b1854717333b05249bf009e33387fe9b8d13de;hp=8adb082271a572c1842581e1d703326e8d0dd2f1;hb=7d324617084454f05cb6498299abb4abffdf3d49;hpb=5871f835aa5215f8d5e416bb44d13a059b523013

diff --git a/xmit.c b/xmit.c
index 8adb082..c4b1854 100644
--- a/xmit.c
+++ b/xmit.c
@@ -81,7 +81,7 @@ void check_assign_articles(void) {
     }
     if (use) {
       int inqueue, spare;
-      conn_inqueue_spare(walk, &inqueue, &spare);
+      conn_inqueue_spare(use, &inqueue, &spare);
       if (!inqueue) use->since_activity= 0; /* reset idle counter */
       while (spare>0) {
 	Article *art= dequeue(0);
@@ -174,7 +174,7 @@ int article_check_expired(Article *art /* must be queued, not conn */) {
 
   LIST_REMOVE(art->ipf->queue, art);
   art->missing= 1;
-  art->ipf->count_nooffer_missing++;
+  art->ipf->counts.events[nooffer_missing]++;
   article_done(art,-1);
   return 1;
 }
@@ -184,6 +184,7 @@ void inputfile_queue_check_expired(InputFile *ipf) {
 
   for (;;) {
     Article *art= LIST_HEAD(ipf->queue);
+    if (!art) break;
     int expd= article_check_expired(art);
     if (!expd) break;
   }
@@ -329,7 +330,7 @@ void conn_make_some_xmits(Conn *conn) {
 	(abort(),-1);
 
       if (!artdata) art->missing= 1;
-      art->ipf->counts[art->state][ artdata ? RC_sent : RC_missing ]++;
+      art->ipf->counts.results[art->state][ artdata ? RC_sent : RC_missing ]++;
 
       if (conn->stream) {
 	if (artdata) {
@@ -363,7 +364,7 @@ void conn_make_some_xmits(Conn *conn) {
       XMIT_LITERAL("\r\n");
 
       assert(art->state == art_Unchecked);
-      art->ipf->counts[art->state][RC_sent]++;
+      art->ipf->counts.results[art->state][RC_sent]++;
       LIST_ADDTAIL(conn->sent, art);
     }
   }