From: Alexander Barton Date: Fri, 9 Feb 2024 23:00:19 +0000 (+0100) Subject: Remove outdated, unsupported and broken support for splint(1) X-Git-Tag: rel-27-rc1~45 X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ea7f4e07b71cd27294bd7deb04d8ffe95b15e2ce;p=ngircd.git Remove outdated, unsupported and broken support for splint(1) --- diff --git a/Makefile.am b/Makefile.am index ae29ac18..11160711 100644 --- 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 21e606d7..5045ebae 100644 --- 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 0e96703d..edf6a836 100644 --- 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 f6f9525b..91a717cd 100644 --- 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 30b77fc3..9be5f567 100644 --- 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 ebe81b49..e0ec3e1e 100644 --- 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 index be33e475..00000000 --- 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- */