Move most copyright notice text into LICENCE.txt (autogen)

[innduct.git] / statemc.c

diff --git a/statemc.c b/statemc.c
index 2e496923a3295768bd3a4913114a538272b07011..26b5c22e4673aabd319401d17ba5e9cfc3c586e8 100644 (file)
--- a/statemc.c
+++ b/statemc.c
@@ -3,25 +3,9 @@
  *  tailing reliable realtime streaming feeder for inn
  *  statemc.c - state machine core (see README.states).
  *
- *  Copyright (C) 2010 Ian Jackson <ijackson@chiark.greenend.org.uk>
- * 
- *  This program is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- * 
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- * 
- *  You should have received a copy of the GNU General Public License
- *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- *  (I believe that when you compile and link this as part of the inn2
- *  build, with the Makefile runes I have provided, all the libraries
- *  and files which end up included in innduct are licence-compatible
- *  with GPLv3.  If not then please let me know.  -Ian Jackson.)
+ *  Copyright Ian Jackson <ijackson@chiark.greenend.org.uk>
+ *  and contributors; see LICENCE.txt.
+ *  SPDX-License-Identifier: GPL-3.0-or-later
  */
 
 #include "innduct.h"
@@ -239,8 +223,8 @@ static void notice_processed_counts(Counts *counts, int completed,
     : masprintf("%s","");
 
   notice("%s %s read=%d (+bl=%d,+err=%d)%s%s missing=%d"
-        " offered=%d (ch=%d,nc=%d;mi=%d)"
-        " accepted=%d (ch=%d,nc=%d;mi=%d)"
+        " offered=%d (ch=%d,nc=%d)"
+        " accepted=%d (ch=%d,nc=%d)"
        RESULT_COUNTS(RCI_NOTHING, RCI_TRIPLE_FMT)
        ,
        completed?"completed":"processed", what,
@@ -248,9 +232,9 @@ static void notice_processed_counts(Counts *counts, int completed,
          counts->events[read_err],
        inprog, autodefer, counts->events[nooffer_missing],
        CNT(Unchecked,sent) + CNT(Unsolicited,sent)
-       , CNT(Unchecked,sent), CNT(Unsolicited,sent), CNT(Unsolicited,missing),
+       , CNT(Unchecked,sent), CNT(Unsolicited,sent),
        CNT(Wanted,accepted) + CNT(Wanted,accepted)
-       , CNT(Wanted,accepted), CNT(Wanted,accepted), CNT(Wanted,missing)
+       , CNT(Wanted,accepted), CNT(Wanted,accepted)
        RESULT_COUNTS(RCI_NOTHING,  RCI_TRIPLE_VALS)
        );