X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=innduct.git;a=blobdiff_plain;f=backends%2Finnduct.c;h=92e80061deb544dc94503db62c8d367dbd77646f;hp=43ae915a1f3646fe58e96c9726b6de405d962d81;hb=7b2769c6878f854cb3601fceb3b14383852f9cdf;hpb=ffe397bdaa6e5f125df3b5abfd71dc402008be9b

diff --git a/backends/innduct.c b/backends/innduct.c
index 43ae915..92e8006 100644
--- a/backends/innduct.c
+++ b/backends/innduct.c
@@ -1,7 +1,5 @@
 /*
  * TODO
- *  - check all init functions called
- *  - check ipf->inprogress managed properly
  *  - xperhaps_close
  *  - actually implement badusage
  *  - options for all options
@@ -276,8 +274,11 @@ static void *conn_write_some_xmits(Conn *conn);
 
 static void xmit_free(XmitDetails *d);
 
+#define SMS(newstate, periods, why) \
+   (statemc_setstate(sm_##newstate,(periods),#newstate,(why)))
 static void statemc_setstate(StateMachineState newsms, int periods,
 			     const char *forlog, const char *why);
+
 static void statemc_start_flush(const char *why); /* Normal => Flushing */
 static void spawn_inndcomm_flush(const char *why); /* Moved => Flushing */
 
@@ -297,7 +298,6 @@ static void search_backlog_file(void);
 static void inputfile_tailing_start(InputFile *ipf);
 static void inputfile_tailing_stop(InputFile *ipf);
 
-static int filemon_init(void);
 static void filemon_start(InputFile *ipf);
 static void filemon_stop(InputFile *ipf);
 static void filemon_callback(InputFile *ipf);
@@ -449,24 +449,22 @@ struct Conn {
 };
 
 
-/*----- operational variables -----*/
+/*----- general operational variables -----*/
 
+/* main initialises */
 static oop_source *loop;
-
-static int until_connect;
 static ConnList conns;
 static ArticleList queue;
-
 static char *path_lock, *path_flushing, *path_defer, *globpat_backlog;
 
-#define SMS(newstate, periods, why) \
-   (statemc_setstate(sm_##newstate,(periods),#newstate,(why)))
-
+/* statemc_init initialises */
 static StateMachineState sms;
 static FILE *defer;
 static InputFile *main_input_file, *flushing_input_file, *backlog_input_file;
-static int sm_period_counter, until_backlog_nextscan;
+static int sm_period_counter;
 
+/* initialisation to 0 is good */
+static int until_connect, until_backlog_nextscan;
 static double accept_proportion;
 static int nocheck, nocheck_reported;