diff options
44 files changed, 2 insertions, 149 deletions
diff --git a/src/ngircd/channel.c b/src/ngircd/channel.c index 12bd8128..e879dcdd 100644 --- a/src/ngircd/channel.c +++ b/src/ngircd/channel.c @@ -18,7 +18,6 @@ * Channel management */ -#include "imp.h" #include <assert.h> #include <stdlib.h> #include <string.h> @@ -29,10 +28,8 @@ #include "defines.h" #include "conn-func.h" -#include "exp.h" #include "channel.h" -#include "imp.h" #include "irc-write.h" #include "conf.h" #include "hash.h" @@ -41,9 +38,6 @@ #include "messages.h" #include "match.h" -#include "exp.h" - - #define REMOVE_PART 0 #define REMOVE_QUIT 1 #define REMOVE_KICK 2 diff --git a/src/ngircd/class.c b/src/ngircd/class.c index d08f4c56..df444fec 100644 --- a/src/ngircd/class.c +++ b/src/ngircd/class.c @@ -16,7 +16,6 @@ * User class management. */ -#include "imp.h" #include <assert.h> #include <string.h> @@ -28,7 +27,6 @@ #include "match.h" #include "stdio.h" -#include "exp.h" #include "class.h" struct list_head My_Classes[CLASS_COUNT]; diff --git a/src/ngircd/client-cap.c b/src/ngircd/client-cap.c index b0da8073..42463b79 100644 --- a/src/ngircd/client-cap.c +++ b/src/ngircd/client-cap.c @@ -18,7 +18,6 @@ * Functions to deal with IRC Capabilities */ -#include "imp.h" #include <assert.h> #include "defines.h" @@ -26,7 +25,6 @@ #include "client.h" #include "log.h" -#include "exp.h" #include "client-cap.h" GLOBAL int diff --git a/src/ngircd/client.c b/src/ngircd/client.c index bfb52e8f..befb779c 100644 --- a/src/ngircd/client.c +++ b/src/ngircd/client.c @@ -18,7 +18,6 @@ * Client management. */ -#include "imp.h" #include <assert.h> #include <unistd.h> #include <stdio.h> @@ -29,11 +28,8 @@ #include "defines.h" #include "conn.h" - -#include "exp.h" #include "client.h" -#include <imp.h> #include "ngircd.h" #include "channel.h" #include "conf.h" @@ -44,8 +40,6 @@ #include "match.h" #include "messages.h" -#include <exp.h> - #define GETID_LEN (CLIENT_NICK_LEN-1) + 1 + (CLIENT_USER_LEN-1) + 1 + (CLIENT_HOST_LEN-1) + 1 static CLIENT *This_Server, *My_Clients; diff --git a/src/ngircd/conf.c b/src/ngircd/conf.c index c4b219f8..90ba72d3 100644 --- a/src/ngircd/conf.c +++ b/src/ngircd/conf.c @@ -16,7 +16,6 @@ * Configuration management (reading, parsing & validation) */ -#include "imp.h" #include <assert.h> #include <ctype.h> #include <errno.h> @@ -45,7 +44,6 @@ #include "match.h" #include "tool.h" -#include "exp.h" #include "conf.h" diff --git a/src/ngircd/conn-encoding.c b/src/ngircd/conn-encoding.c index b827d02a..c0710d8b 100644 --- a/src/ngircd/conn-encoding.c +++ b/src/ngircd/conn-encoding.c @@ -20,7 +20,6 @@ * Functions to deal with character encodings and conversions */ -#include "imp.h" #include <assert.h> #include <stdio.h> #include <string.h> @@ -29,7 +28,6 @@ #include "conn.h" #include "log.h" -#include "exp.h" #include "conn-encoding.h" #ifdef ICONV diff --git a/src/ngircd/conn-func.c b/src/ngircd/conn-func.c index 0ba0ff6c..75831589 100644 --- a/src/ngircd/conn-func.c +++ b/src/ngircd/conn-func.c @@ -18,7 +18,6 @@ * Connection management: Global functions */ -#include "imp.h" #include <assert.h> #include <string.h> #include "log.h" @@ -26,7 +25,6 @@ #include "conn.h" #include "client.h" -#include "exp.h" #include "conn-func.h" /** diff --git a/src/ngircd/conn-ssl.c b/src/ngircd/conn-ssl.c index 493bcc75..cdb3e24d 100644 --- a/src/ngircd/conn-ssl.c +++ b/src/ngircd/conn-ssl.c @@ -10,7 +10,6 @@ * SSL wrapper functions */ -#include "imp.h" #include "conf-ssl.h" #ifdef SSL_SUPPORT @@ -29,7 +28,6 @@ #include "conn-ssl.h" #include "log.h" -#include "exp.h" #include "defines.h" extern struct SSLOptions Conf_SSLOptions; diff --git a/src/ngircd/conn-zip.c b/src/ngircd/conn-zip.c index 0a3c17c8..f9dcb68a 100644 --- a/src/ngircd/conn-zip.c +++ b/src/ngircd/conn-zip.c @@ -23,7 +23,6 @@ /* enable more zlib related debug messages: */ /* #define DEBUG_ZLIB */ -#include "imp.h" #include <assert.h> #include <string.h> #include <zlib.h> @@ -31,9 +30,8 @@ #include "conn.h" #include "conn-func.h" #include "log.h" - #include "array.h" -#include "exp.h" + #include "conn-zip.h" diff --git a/src/ngircd/conn.c b/src/ngircd/conn.c index fad34357..5ef28dc0 100644 --- a/src/ngircd/conn.c +++ b/src/ngircd/conn.c @@ -22,7 +22,6 @@ * Connection management */ -#include "imp.h" #include <assert.h> #ifdef PROTOTYPES # include <stdarg.h> @@ -54,10 +53,8 @@ #include "array.h" #include "defines.h" -#include "exp.h" #include "conn.h" -#include "imp.h" #include "ngircd.h" #include "array.h" #include "client.h" @@ -73,9 +70,6 @@ #include "resolve.h" #include "tool.h" -#include "exp.h" - - #define SERVER_WAIT (NONE - 1) #define MAX_COMMANDS 3 diff --git a/src/ngircd/hash.c b/src/ngircd/hash.c index 3c600384..46d1a7b4 100644 --- a/src/ngircd/hash.c +++ b/src/ngircd/hash.c @@ -16,14 +16,12 @@ * Hash calculation */ -#include "imp.h" #include <assert.h> #include <string.h> #include "defines.h" #include "tool.h" -#include "exp.h" #include "hash.h" static UINT32 jenkins_hash PARAMS((UINT8 *k, UINT32 length, UINT32 initval)); diff --git a/src/ngircd/irc-cap.c b/src/ngircd/irc-cap.c index 42b0e4da..c780921e 100644 --- a/src/ngircd/irc-cap.c +++ b/src/ngircd/irc-cap.c @@ -16,7 +16,6 @@ * Handler for IRC capability ("CAP") commands */ -#include "imp.h" #include <assert.h> #include <string.h> @@ -31,7 +30,6 @@ #include "messages.h" #include "parse.h" -#include "exp.h" #include "irc-cap.h" /* Local functions */ diff --git a/src/ngircd/irc-channel.c b/src/ngircd/irc-channel.c index cab20c49..4eee5046 100644 --- a/src/ngircd/irc-channel.c +++ b/src/ngircd/irc-channel.c @@ -16,7 +16,6 @@ * IRC channel commands */ -#include "imp.h" #include <assert.h> #include <stdlib.h> #include <stdio.h> @@ -37,7 +36,6 @@ #include "irc-write.h" #include "conf.h" -#include "exp.h" #include "irc-channel.h" /** diff --git a/src/ngircd/irc-encoding.c b/src/ngircd/irc-encoding.c index 97b518a0..dfc412bc 100644 --- a/src/ngircd/irc-encoding.c +++ b/src/ngircd/irc-encoding.c @@ -16,7 +16,6 @@ * IRC encoding commands */ -#include "imp.h" #include <assert.h> #include <string.h> @@ -28,7 +27,6 @@ #include "parse.h" #include "tool.h" -#include "exp.h" #include "irc-encoding.h" #ifdef ICONV diff --git a/src/ngircd/irc-info.c b/src/ngircd/irc-info.c index d367647f..6a405729 100644 --- a/src/ngircd/irc-info.c +++ b/src/ngircd/irc-info.c @@ -16,7 +16,6 @@ * IRC info commands */ -#include "imp.h" #include <assert.h> #include <errno.h> #include <stdio.h> @@ -43,7 +42,6 @@ #include "client-cap.h" #include "op.h" -#include "exp.h" #include "irc-info.h" /* Local functions */ diff --git a/src/ngircd/irc-login.c b/src/ngircd/irc-login.c index b7fe5fed..c8cff24d 100644 --- a/src/ngircd/irc-login.c +++ b/src/ngircd/irc-login.c @@ -16,7 +16,6 @@ * Login and logout */ -#include "imp.h" #include <assert.h> #include <ctype.h> #include <stdlib.h> @@ -36,7 +35,6 @@ #include "irc-macros.h" #include "irc-write.h" -#include "exp.h" #include "irc-login.h" static void Change_Nick PARAMS((CLIENT * Origin, CLIENT * Target, char *NewNick, diff --git a/src/ngircd/irc-metadata.c b/src/ngircd/irc-metadata.c index f7948e6a..9a3a94b3 100644 --- a/src/ngircd/irc-metadata.c +++ b/src/ngircd/irc-metadata.c @@ -18,7 +18,6 @@ * IRC metadata commands */ -#include "imp.h" #include <assert.h> #include <string.h> #include <stdio.h> @@ -32,7 +31,6 @@ #include "parse.h" #include "tool.h" -#include "exp.h" #include "irc-metadata.h" /** diff --git a/src/ngircd/irc-mode.c b/src/ngircd/irc-mode.c index a59f085d..b83c1eb4 100644 --- a/src/ngircd/irc-mode.c +++ b/src/ngircd/irc-mode.c @@ -16,7 +16,6 @@ * IRC commands for mode changes (like MODE, AWAY, etc.) */ -#include "imp.h" #include <assert.h> #include <stdio.h> #include <stdlib.h> @@ -33,7 +32,6 @@ #include "messages.h" #include "conf.h" -#include "exp.h" #include "irc-mode.h" static bool Client_Mode PARAMS((CLIENT *Client, REQUEST *Req, CLIENT *Origin, diff --git a/src/ngircd/irc-op.c b/src/ngircd/irc-op.c index b08d739b..0934285c 100644 --- a/src/ngircd/irc-op.c +++ b/src/ngircd/irc-op.c @@ -16,7 +16,6 @@ * Channel operator commands */ -#include "imp.h" #include <assert.h> #include <string.h> #include <stdio.h> @@ -31,7 +30,6 @@ #include "messages.h" #include "parse.h" -#include "exp.h" #include "irc-op.h" /* Local functions */ diff --git a/src/ngircd/irc-oper.c b/src/ngircd/irc-oper.c index 88a9e43e..1a2150f1 100644 --- a/src/ngircd/irc-oper.c +++ b/src/ngircd/irc-oper.c @@ -16,7 +16,6 @@ * IRC operator commands */ -#include "imp.h" #include <assert.h> #include <stdio.h> #include <stdlib.h> @@ -38,7 +37,6 @@ #include "messages.h" #include "op.h" -#include <exp.h> #include "irc-oper.h" /** diff --git a/src/ngircd/irc-server.c b/src/ngircd/irc-server.c index 7dbaba86..fa1ca966 100644 --- a/src/ngircd/irc-server.c +++ b/src/ngircd/irc-server.c @@ -16,7 +16,6 @@ * IRC commands for server links */ -#include "imp.h" #include <assert.h> #include <stdio.h> #include <stdlib.h> @@ -40,7 +39,6 @@ #include "irc-write.h" #include "op.h" -#include "exp.h" #include "irc-server.h" /** diff --git a/src/ngircd/irc-write.c b/src/ngircd/irc-write.c index 5503344d..c6a3dce2 100644 --- a/src/ngircd/irc-write.c +++ b/src/ngircd/irc-write.c @@ -16,7 +16,6 @@ * Sending IRC commands over the network */ -#include "imp.h" #include <assert.h> #ifdef PROTOTYPES # include <stdarg.h> @@ -30,7 +29,6 @@ #include "conn-func.h" #include "channel.h" -#include "exp.h" #include "irc-write.h" #define SEND_TO_USER 1 diff --git a/src/ngircd/irc.c b/src/ngircd/irc.c index d6a751a0..e99f42ff 100644 --- a/src/ngircd/irc.c +++ b/src/ngircd/irc.c @@ -16,7 +16,6 @@ * IRC commands */ -#include "imp.h" #include <assert.h> #include <stdio.h> #include <string.h> @@ -36,7 +35,6 @@ #include "op.h" #include "tool.h" -#include "exp.h" #include "irc.h" static char *Option_String PARAMS((CONN_ID Idx)); diff --git a/src/ngircd/lists.c b/src/ngircd/lists.c index b0accd41..d3efb1f7 100644 --- a/src/ngircd/lists.c +++ b/src/ngircd/lists.c @@ -16,7 +16,6 @@ * Management of IRC lists: ban, invite, etc. */ -#include "imp.h" #include <assert.h> #include "defines.h" @@ -31,7 +30,6 @@ #include <string.h> #include <strings.h> -#include "exp.h" #include "lists.h" struct list_elem { diff --git a/src/ngircd/log.c b/src/ngircd/log.c index 32cf6cfd..cc819ad7 100644 --- a/src/ngircd/log.c +++ b/src/ngircd/log.c @@ -16,7 +16,6 @@ * Logging functions */ -#include "imp.h" #include <assert.h> #include <errno.h> #ifdef PROTOTYPES @@ -40,7 +39,6 @@ #include "irc-write.h" #include "conf.h" -#include "exp.h" #include "log.h" static bool Is_Daemon; diff --git a/src/ngircd/login.c b/src/ngircd/login.c index 23c3b684..b3ab2ed3 100644 --- a/src/ngircd/login.c +++ b/src/ngircd/login.c @@ -16,7 +16,6 @@ * Functions to deal with client logins */ -#include "imp.h" #include <assert.h> #include <stdlib.h> #include <stdio.h> @@ -41,7 +40,6 @@ #include "irc-mode.h" #include "irc-write.h" -#include "exp.h" #include "login.h" #ifdef PAM diff --git a/src/ngircd/match.c b/src/ngircd/match.c index 88872f0d..f1a0875e 100644 --- a/src/ngircd/match.c +++ b/src/ngircd/match.c @@ -16,11 +16,9 @@ * Wildcard pattern matching */ -#include "imp.h" #include <assert.h> #include <string.h> -#include "exp.h" #include "match.h" #include "defines.h" #include "tool.h" diff --git a/src/ngircd/ngircd.c b/src/ngircd/ngircd.c index d8762330..b266c534 100644 --- a/src/ngircd/ngircd.c +++ b/src/ngircd/ngircd.c @@ -17,7 +17,6 @@ * by the loader of the operating system. */ -#include "imp.h" #include <assert.h> #include <errno.h> #include <stdio.h> @@ -49,7 +48,6 @@ #include "io.h" #include "irc.h" -#include "exp.h" #include "ngircd.h" static void Show_Version PARAMS(( void )); diff --git a/src/ngircd/numeric.c b/src/ngircd/numeric.c index c5bf4bd3..e1b160b3 100644 --- a/src/ngircd/numeric.c +++ b/src/ngircd/numeric.c @@ -16,7 +16,6 @@ * Handlers for IRC numerics sent to the server */ -#include "imp.h" #include <assert.h> #include <stdio.h> #include <stdlib.h> @@ -35,10 +34,8 @@ #include "messages.h" #include "parse.h" -#include "exp.h" #include "numeric.h" - /** * Announce a channel and its users in the network. */ diff --git a/src/ngircd/op.c b/src/ngircd/op.c index 6738d535..66e9d5a2 100644 --- a/src/ngircd/op.c +++ b/src/ngircd/op.c @@ -16,7 +16,6 @@ * IRC operator functions */ -#include "imp.h" #include <assert.h> #include <string.h> @@ -28,10 +27,8 @@ #include "messages.h" #include "irc-write.h" -#include <exp.h> #include "op.h" - /** * Return and log a "no privileges" message. */ diff --git a/src/ngircd/pam.c b/src/ngircd/pam.c index 81d635c8..dd15052f 100644 --- a/src/ngircd/pam.c +++ b/src/ngircd/pam.c @@ -18,7 +18,6 @@ * PAM User Authentication */ -#include "imp.h" #include <assert.h> #include "defines.h" @@ -37,7 +36,6 @@ #include <pam/pam_appl.h> #endif -#include "exp.h" #include "pam.h" static char *password; diff --git a/src/ngircd/parse.c b/src/ngircd/parse.c index fdb957c3..fa91a9b1 100644 --- a/src/ngircd/parse.c +++ b/src/ngircd/parse.c @@ -16,7 +16,6 @@ * IRC command parser and validator. */ -#include "imp.h" #include <assert.h> #include <stdlib.h> #include <stdio.h> @@ -31,10 +30,8 @@ #include "messages.h" #include "tool.h" -#include "exp.h" #include "parse.h" -#include "imp.h" #include "irc.h" #include "irc-cap.h" #include "irc-channel.h" @@ -49,7 +46,6 @@ #include "irc-write.h" #include "numeric.h" -#include "exp.h" #include "conf.h" struct _NUMERIC { diff --git a/src/ngircd/proc.c b/src/ngircd/proc.c index a5afb501..4220f1ab 100644 --- a/src/ngircd/proc.c +++ b/src/ngircd/proc.c @@ -16,7 +16,6 @@ * Process management */ -#include "imp.h" #include <assert.h> #include <errno.h> #include <signal.h> @@ -27,8 +26,6 @@ #include "log.h" #include "io.h" #include "conn.h" - -#include "exp.h" #include "sighandlers.h" #include "proc.h" diff --git a/src/ngircd/resolve.c b/src/ngircd/resolve.c index 01f730cc..d3c89f89 100644 --- a/src/ngircd/resolve.c +++ b/src/ngircd/resolve.c @@ -18,7 +18,6 @@ * Asynchronous resolver */ -#include "imp.h" #include <assert.h> #include <errno.h> #include <stdlib.h> @@ -42,11 +41,9 @@ #include "log.h" #include "ng_ipaddr.h" -#include "exp.h" #include "resolve.h" #include "io.h" - static void Do_ResolveAddr PARAMS(( const ng_ipaddr_t *Addr, int Sock, int w_fd )); static void Do_ResolveName PARAMS(( const char *Host, int w_fd )); diff --git a/src/ngircd/sighandlers.c b/src/ngircd/sighandlers.c index effef44d..a953d02b 100644 --- a/src/ngircd/sighandlers.c +++ b/src/ngircd/sighandlers.c @@ -25,7 +25,6 @@ #include <sys/types.h> #include <sys/wait.h> -#include "imp.h" #include "conn.h" #include "conf-ssl.h" #include "channel.h" diff --git a/src/portab/Makefile.ng b/src/portab/Makefile.ng index 17edbdf2..c9638034 100644 --- a/src/portab/Makefile.ng +++ b/src/portab/Makefile.ng @@ -25,7 +25,7 @@ portabtest_LDFLAGS = -L. portabtest_LDADD = -lngportab -noinst_HEADERS = imp.h exp.h portab.h splint.h +noinst_HEADERS = portab.h splint.h maintainer-clean-local: rm -f Makefile Makefile.in Makefile.am diff --git a/src/portab/exp.h b/src/portab/exp.h deleted file mode 100644 index d678b99a..00000000 --- a/src/portab/exp.h +++ /dev/null @@ -1,21 +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. - */ - -/** - * @file - * "Export Header" which makes sure, that global functions are not "extern". - */ - -#undef GLOBAL -#define GLOBAL - -/* -eof- */ diff --git a/src/portab/imp.h b/src/portab/imp.h deleted file mode 100644 index 68b5aeee..00000000 --- a/src/portab/imp.h +++ /dev/null @@ -1,21 +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. - */ - -/** - * @file - * "Import Header" which makes sure that global functions are defined "extern". - */ - -#undef GLOBAL -#define GLOBAL extern - -/* -eof- */ diff --git a/src/portab/portabtest.c b/src/portab/portabtest.c index 3602feec..d7f33f99 100644 --- a/src/portab/portabtest.c +++ b/src/portab/portabtest.c @@ -16,14 +16,11 @@ * Test program for portab.h and friends ;-) */ -#include "imp.h" #include <stdarg.h> #include <stdio.h> #include <stdlib.h> #include <string.h> -#include "exp.h" - int allow_severity = 0, deny_severity = 0; static void diff --git a/src/portab/strdup.c b/src/portab/strdup.c index 795af726..adb19e7a 100644 --- a/src/portab/strdup.c +++ b/src/portab/strdup.c @@ -11,13 +11,10 @@ #ifndef HAVE_STRDUP -#include "imp.h" #include <string.h> #include <stdlib.h> #include <sys/types.h> -#include "exp.h" - GLOBAL char * strdup(const char *s) { diff --git a/src/portab/strlcpy.c b/src/portab/strlcpy.c index ce90a423..a7f5e2f1 100644 --- a/src/portab/strlcpy.c +++ b/src/portab/strlcpy.c @@ -22,13 +22,9 @@ * <http://cvs.samba.org/cgi-bin/cvsweb/rsync/lib/compat.c> */ -#include "imp.h" #include <string.h> #include <sys/types.h> -#include "exp.h" - - #ifndef HAVE_STRLCAT GLOBAL size_t diff --git a/src/portab/strndup.c b/src/portab/strndup.c index 578f324c..d63b9728 100644 --- a/src/portab/strndup.c +++ b/src/portab/strndup.c @@ -11,13 +11,10 @@ #ifndef HAVE_STRNDUP -#include "imp.h" #include <string.h> #include <stdlib.h> #include <sys/types.h> -#include "exp.h" - GLOBAL char * strndup(const char *s, size_t maxlen) { diff --git a/src/portab/waitpid.c b/src/portab/waitpid.c index 5846bd8f..921dd3d6 100644 --- a/src/portab/waitpid.c +++ b/src/portab/waitpid.c @@ -12,13 +12,10 @@ #ifndef HAVE_WAITPID -#include "imp.h" #include <string.h> #include <stdlib.h> #include <sys/types.h> -#include "exp.h" - GLOBAL int waitpid(pid, stat_loc, options) int pid, *stat_loc, options; diff --git a/src/tool/tool.c b/src/tool/tool.c index 3b9cc255..8fe6e05e 100644 --- a/src/tool/tool.c +++ b/src/tool/tool.c @@ -16,7 +16,6 @@ * Tool functions */ -#include "imp.h" #include <assert.h> #include <ctype.h> #include <stdio.h> @@ -31,7 +30,6 @@ #include <syslog.h> #endif -#include "exp.h" #include "tool.h" |