rename of a few files to be consistent with others

.gitattributes

@@ -69,8 +69,8 @@ src/bans.c -text
 src/bans.h -text
 src/bots.c -text
 src/bots.h -text
-src/chans.c eol=lf
-src/chans.h eol=lf
+src/channels.c eol=lf
+src/channels.h eol=lf
 src/commands.c -text
 src/commands.h -text
 src/conf.c eol=lf
@@ -321,8 +321,8 @@ src/protocol/unreal.c eol=lf
 src/protocol/unreal.h eol=lf
 src/protocol/viagra.c -text
 src/protocol/viagra.h -text
-src/server.c eol=lf
-src/server.h eol=lf
+src/servers.c eol=lf
+src/servers.h eol=lf
 src/services.c eol=lf
 src/services.h eol=lf
 src/signals.c -text

src/Makefile.in

@@ -12,8 +12,8 @@ KEEPER_OBJS = keeper/kp_cache.o keeper/kp_dir.o keeper/kp_enum.o keeper/kp_get.o
 		keeper/kp_util.o
 PROTOCOL_OBJS = protocol/@PROTOCOL@.o
 OBJS = ${SRCS:.c=.o} 
-SRCS =	dns.c chans.c dotconf.c services.c main.c sock.c conf.c ircd.c timer.c \
-		users.c ns_help.c dl.c list.c hash.c server.c keeper.c log.c misc.c \
+SRCS =	dns.c channels.c dotconf.c services.c main.c sock.c conf.c ircd.c timer.c \
+		users.c ns_help.c dl.c list.c hash.c servers.c keeper.c log.c misc.c \
 		support.c ircstring.c commands.c transfer.c exclude.c match.c bans.c \
 		bots.c modules.c auth.c signals.c
 
@@ -21,13 +21,13 @@ INCLUDES = config.h dl.h dotconf.h hash.h list.h neostats.h \
 		conf.h log.h support.h ircstring.h events.h numeric.h pcre.h \
 		transfer.h
 COREINCS = dns.h services.h sock.h ircd.h exclude.h \
-		ns_help.h timer.h users.h chans.h server.h bans.h \
+		ns_help.h timer.h users.h channels.h servers.h bans.h \
 		bots.h modules.h commands.h auth.h signals.h
 BUILDFILES = *.in modules/Makefile modules/Makefile.inc.in
 
 DISTFILES = $(INCLUDES) $(COREINCS) $(SRCS) $(BUILDFILES) 
  
-DISTLIBS = protocol adns pcre curl sqlsrv keeper
+DISTLIBS = neoprotocol libs sqlsrv
 DISTMOD = connectserv extauth hostserv loveserv moraleserv statserv template
 
 all: buildversion @buildsqlsrv@ libs neoprotocol neostats neomodules utils 

src/channels.c

@@ -26,7 +26,7 @@
 #include "ircd.h"
 #include "hash.h"
 #include "users.h"
-#include "chans.h"
+#include "channels.h"
 #include "exclude.h"
 #ifdef SQLSRV
 #include "sqlsrv/rta.h"

src/ircd.c

@@ -33,9 +33,9 @@
 #include "commands.h"
 #include "sock.h"
 #include "users.h"
-#include "chans.h"
+#include "channels.h"
 #include "services.h"
-#include "server.h"
+#include "servers.h"
 #include "bans.h"
 #include "auth.h"
 

src/main.c

@@ -28,8 +28,8 @@
 #include "log.h"
 #include "sock.h"
 #include "users.h"
-#include "server.h"
-#include "chans.h"
+#include "servers.h"
+#include "channels.h"
 #include "dns.h"
 #include "dotconf.h"
 #include "transfer.h"
@@ -48,9 +48,6 @@
 char segv_location[SEGV_LOCATION_BUFSIZE];
 char segv_inmodule[SEGV_INMODULE_BUFSIZE];
 
-/*! File handle for segfault report */
-static FILE *segfault;
-
 /*! Date when we were compiled */
 const char version_date[] = __DATE__;
 /*! Time we were compiled */

src/modules/connectserv/cs.c

@@ -139,7 +139,7 @@ static bot_setting cs_settings[]=
 	{"MODEWATCH",	&cs_cfg.mode_watch,	SET_TYPE_BOOLEAN,	0, 0, 	NS_ULEVEL_ADMIN, "ModeWatch",	NULL,	cs_help_set_modewatch, NULL, (void*)1 },
 	{"NICKWATCH",	&cs_cfg.nick_watch,	SET_TYPE_BOOLEAN,	0, 0, 	NS_ULEVEL_ADMIN, "NickWatch",	NULL,	cs_help_set_nickwatch, NULL, (void*)1 },
 	{"SERVWATCH",	&cs_cfg.serv_watch,	SET_TYPE_BOOLEAN,	0, 0, 	NS_ULEVEL_ADMIN, "ServWatch",	NULL,	cs_help_set_servwatch, NULL, (void*)1 },
-	{"USEEXCLUSIONS", &cs_cfg.use_exc,	SET_TYPE_BOOLEAN,	0, 0, 	NS_ULEVEL_ADMIN, "Exclusions",	NULL,	cs_help_set_exclusions, NULL, (void*)1 },
+	{"EXCLUSIONS",	&cs_cfg.use_exc,	SET_TYPE_BOOLEAN,	0, 0, 	NS_ULEVEL_ADMIN, "Exclusions",	NULL,	cs_help_set_exclusions, NULL, (void*)1 },
 	{NULL,			NULL,				0,					0, 0, 	0,				 NULL,			NULL,	NULL	},
 };
 

src/protocol/ircu.c

@@ -26,8 +26,8 @@
 #include "sock.h"
 #include "ircu.h"
 #include "users.h"
-#include "server.h"
-#include "chans.h"
+#include "servers.h"
+#include "channels.h"
 #include <arpa/inet.h> 
 
 void process_ircd_cmd (int cmdptr, char *cmd, char* origin, char **av, int ac);

src/services.c

@@ -33,8 +33,8 @@
 #include "sock.h"
 #include "ns_help.h"
 #include "users.h"
-#include "server.h"
-#include "chans.h"
+#include "servers.h"
+#include "channels.h"
 #include "ircd.h"
 #include "hash.h"
 #include "exclude.h"

src/timer.c

@@ -24,7 +24,7 @@
 */
 
 #include "neostats.h"
-#include "server.h"
+#include "servers.h"
 #include "services.h"
 #include "modules.h"
 #include "log.h"

src/users.c

@@ -29,7 +29,7 @@
 #include "ircd.h"
 #include "hash.h"
 #include "users.h"
-#include "chans.h"
+#include "channels.h"
 #include "exclude.h"
 #include "modules.h"
 #include "bots.h"