Remove outdated, unsupported and broken support for splint(1)

diff --git a/Makefile.am b/Makefile.am
index ae29ac18acc18fe1e5c125f53b4954dfa6b621fc..11160711568f8c7812e75f9aeb7dbca11c6f5adc 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -32,9 +32,6 @@ maintainer-clean-local:
 testsuite:
        cd src/testsuite && ${MAKE} check
 
-lint:
-       cd src/ngircd && ${MAKE} lint
-
 srcdoc:
        cd doc && ${MAKE} srcdoc
 
@@ -45,6 +42,6 @@ deb:
        [ -f debian/rules ] || ln -s contrib/Debian debian
        dpkg-buildpackage --build=binary
 
-.PHONY: deb lint rpm srcdoc testsuite
+.PHONY: deb rpm srcdoc testsuite
 
 # -eof-

diff --git a/src/ngircd/Makefile.ng b/src/ngircd/Makefile.ng
index 21e606d7433a675311c11be3b566c42d34b52c79..5045ebaeaa5b440971f326d7201292521af687d3 100644 (file)
--- a/src/ngircd/Makefile.ng
+++ b/src/ngircd/Makefile.ng
@@ -1,6 +1,6 @@
 #
 # ngIRCd -- The Next Generation IRC Daemon
-# Copyright (c)2001-2012 Alexander Barton (alex@barton.de) and Contributors
+# Copyright (c)2001-2024 Alexander Barton (alex@barton.de) and Contributors
 #
 # 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
@@ -15,9 +15,6 @@ EXTRA_DIST = Makefile.ng
 
 AM_CPPFLAGS = -I$(srcdir)/../portab -I$(srcdir)/../tool -I$(srcdir)/../ipaddr
 
-LINTARGS = -weak -warnunixlib +unixlib -booltype BOOLEAN \
- -varuse -retvalother -emptyret -unrecog
-
 sbin_PROGRAMS = ngircd
 
 ngircd_SOURCES = \
@@ -107,7 +104,7 @@ noinst_HEADERS = \
        sighandlers.h
 
 clean-local:
-       rm -f check-version check-help lint.out
+       rm -f check-version check-help
 
 maintainer-clean-local:
        rm -f Makefile Makefile.in Makefile.am
@@ -122,32 +119,6 @@ check-help: Makefile
        echo "./ngircd --help | grep help >/dev/null 2>&1" >>check-help
        chmod 755 check-help
 
-lint:
-       @splint --version >/dev/null 2>&1 \
-        || ( echo; echo "Error: \"splint\" not found!"; echo; exit 1 )
-       @echo; warnings=0; files=0; \
-       for f in *.c; do \
-        echo "checking $$f ..."; \
-        splint $$f $(LINTARGS) -I$(srcdir) -I$(srcdir)/.. \
-         $(AM_CPPFLAGS) $(AM_CFLAGS) >lint.out 2>&1; \
-        grep "no warnings" lint.out > /dev/null 2>&1; \
-        if [ $$? -ne 0 ]; then \
-         waswarning=1; \
-         echo; grep -v "^Command Line: " lint.out; echo; \
-         w=$$( grep "code warning" lint.out | $(AWK) "{ print \$$4 }" ); \
-         [ "$$w" -gt 0 ] && warnings=`expr $$warnings + $$w`; \
-         files=`expr $$files + 1`; \
-        else \
-         waswarning=0; \
-        fi; \
-        rm -f lint.out; \
-       done; \
-       [ $$waswarning -eq 0 ] && echo; \
-       [ $$warnings -gt 0 ] \
-        && echo "Result: $$warnings warning(s) in $$files file(s)!" \
-        || echo "Result: no warnings found."; \
-       echo; [ $$warnings -gt 0 ] && exit 1
-
 TESTS = check-version check-help
 
 # -eof-

diff --git a/src/ngircd/channel.h b/src/ngircd/channel.h
index 0e96703d5bdcdf027c6ba9f2ba9b5404561c096c..edf6a836aa7c7108a88e6a4eacce7f15b3505570 100644 (file)
--- a/src/ngircd/channel.h
+++ b/src/ngircd/channel.h
@@ -1,6 +1,6 @@
 /*
  * ngIRCd -- The Next Generation IRC Daemon
- * Copyright (c)2001-2012 Alexander Barton (alex@barton.de) and Contributors.
+ * Copyright (c)2001-2024 Alexander Barton (alex@barton.de) and Contributors.
  *
  * 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
@@ -17,7 +17,7 @@
  * Channel management (header)
  */
 
-#if defined(__channel_c__) | defined(S_SPLINT_S)
+#if defined(__channel_c__)
 
 #include "lists.h"
 #include "defines.h"

diff --git a/src/ngircd/client.h b/src/ngircd/client.h
index f6f9525b9c40beaaa9924dd43c684167192581ce..91a717cd632613dcc082c0ea5367c238016a32e2 100644 (file)
--- a/src/ngircd/client.h
+++ b/src/ngircd/client.h
@@ -1,6 +1,6 @@
 /*
  * ngIRCd -- The Next Generation IRC Daemon
- * Copyright (c)2001-2013 Alexander Barton (alex@barton.de) and Contributors.
+ * Copyright (c)2001-2024 Alexander Barton (alex@barton.de) and Contributors.
  *
  * 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
@@ -36,7 +36,7 @@
 
 #include "defines.h"
 
-#if defined(__client_c__) | defined(__client_cap_c__) | defined(S_SPLINT_S)
+#if defined(__client_c__) | defined(__client_cap_c__)
 
 typedef struct _CLIENT
 {

diff --git a/src/portab/Makefile.ng b/src/portab/Makefile.ng
index 30b77fc3e532fd4f71c334238b298b29d8b9dab9..9be5f567414fa4c40aa3886a576ba3ee4091ca40 100644 (file)
--- a/src/portab/Makefile.ng
+++ b/src/portab/Makefile.ng
@@ -1,6 +1,6 @@
 #
 # ngIRCd -- The Next Generation IRC Daemon
-# Copyright (c)2001-2014 Alexander Barton (alex@barton.de) and Contributors
+# Copyright (c)2001-2024 Alexander Barton (alex@barton.de) and Contributors
 #
 # 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
@@ -31,7 +31,7 @@ portabtest_LDFLAGS = -L.
 
 portabtest_LDADD = -lngportab
 
-noinst_HEADERS = portab.h splint.h
+noinst_HEADERS = portab.h
 
 maintainer-clean-local:
        rm -f Makefile Makefile.in Makefile.am

diff --git a/src/portab/portab.h b/src/portab/portab.h
index ebe81b49ff9ca511dbfe410539351952ea6794d5..e0ec3e1e661b08b5854114029c6ac6e540f3a6fe 100644 (file)
--- a/src/portab/portab.h
+++ b/src/portab/portab.h
@@ -110,12 +110,6 @@ typedef unsigned char bool;
 #define GLOBAL extern
 #endif
 
-/* SPLint */
-
-#ifdef S_SPLINT_S
-# include "splint.h"
-#endif
-
 /* target constants  */
 
 #ifndef HOST_OS

diff --git a/src/portab/splint.h b/src/portab/splint.h
deleted file mode 100644 (file)
index be33e47..0000000
--- a/src/portab/splint.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * ngIRCd -- The Next Generation IRC Daemon
- * Copyright (c)2001,2002 by Alexander Barton (alex@barton.de)
- *
- * Dieses Programm ist freie Software. Sie koennen es unter den Bedingungen
- * der GNU General Public License (GPL), wie von der Free Software Foundation
- * herausgegeben, weitergeben und/oder modifizieren, entweder unter Version 2
- * der Lizenz oder (wenn Sie es wuenschen) jeder spaeteren Version.
- * Naehere Informationen entnehmen Sie bitter der Datei COPYING. Eine Liste
- * der an ngIRCd beteiligten Autoren finden Sie in der Datei AUTHORS.
- */
-
-#ifndef __splint__
-#define __splint__
-
-/**
- * @file
- * Header file which is included for SPLint code checks
- *
- * This header is only included by portab.h if a SPLint code check is
- * running (when S_SPLINT_S is defined). It makes some definitions to
- * prevent SPLint from issuing false warnings.
- */
-
-#define SYSCONFDIR "/"
-#define LOCALSTATEDIR "/"
-
-#define LOG_EMERG 0
-#define LOG_ALERT 1
-#define LOG_CRIT 2
-#define LOG_ERR 3
-#define LOG_WARNING 4
-#define LOG_NOTICE 5
-#define LOG_INFO 6
-#define LOG_DEBUG 7
-
-#define WNOHANG 0
-
-#endif
-
-/* -eof- */