remove redundant database files

.gitattributes

@@ -506,8 +506,6 @@ modules/statserv/Makefile.am -text
 modules/statserv/Makefile.in -text
 modules/statserv/channel.c -text
 modules/statserv/channel.h -text
-modules/statserv/database.c -text
-modules/statserv/database.h -text
 modules/statserv/geoip/GeoIP.c -text
 modules/statserv/geoip/GeoIP.h -text
 modules/statserv/geoip/GeoIPBitReader.c -text

modules/statserv/Makefile.am

@@ -1,5 +1,5 @@
 pkglib_LTLIBRARIES	= statserv.la
-statserv_la_SOURCES	= ss_help.c database.c database.h \
+statserv_la_SOURCES	= ss_help.c \
 			stats.c stats.h statserv.c statserv.h \
 			htmlstats.c htmlstats.h statsrta.c statsrta.h \
 			tld.c tld.h channel.c channel.h \

modules/statserv/Makefile.in

@@ -64,10 +64,9 @@ am__installdirs = "$(DESTDIR)$(pkglibdir)" "$(DESTDIR)$(datadir)"
 pkglibLTLIBRARIES_INSTALL = $(INSTALL)
 LTLIBRARIES = $(pkglib_LTLIBRARIES)
 statserv_la_LIBADD =
-am_statserv_la_OBJECTS = ss_help.lo database.lo stats.lo statserv.lo \
+am_statserv_la_OBJECTS = ss_help.lo stats.lo statserv.lo htmlstats.lo \
-	htmlstats.lo statsrta.lo tld.lo channel.lo user.lo network.lo \
+	statsrta.lo tld.lo channel.lo user.lo network.lo server.lo \
-	server.lo version.lo GeoIPCity.lo GeoIPBitReader.lo GeoIP.lo \
+	version.lo GeoIPCity.lo GeoIPBitReader.lo GeoIP.lo md5.lo
-	md5.lo
 statserv_la_OBJECTS = $(am_statserv_la_OBJECTS)
 DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/include -I$(top_builddir)/lib/gdbm
 depcomp = $(SHELL) $(top_srcdir)/autotools/depcomp
@@ -209,7 +208,7 @@ sysconfdir = @sysconfdir@
 target_alias = @target_alias@
 wi_PWD = @wi_PWD@
 pkglib_LTLIBRARIES = statserv.la
-statserv_la_SOURCES = ss_help.c database.c database.h \
+statserv_la_SOURCES = ss_help.c \
 			stats.c stats.h statserv.c statserv.h \
 			htmlstats.c htmlstats.h statsrta.c statsrta.h \
 			tld.c tld.h channel.c channel.h \
@@ -291,7 +290,6 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/GeoIPBitReader.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/GeoIPCity.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/channel.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/database.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/htmlstats.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/md5.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/network.Plo@am__quote@

modules/statserv/database.c

@@ -1,34 +0,0 @@
-/* NeoStats - IRC Statistical Services 
-** Copyright (c) 1999-2005 Adam Rutter, Justin Hammond, Mark Hetherington
-** http://www.neostats.net/
-**
-**  Portions Copyright (c) 2000-2001 ^Enigma^
-**
-**  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 2 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, write to the Free Software
-**  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
-**  USA
-**
-** NeoStats CVS Identification
-** $Id$
-*/
-
-#include "neostats.h"
-#include "statserv.h"
-#include "stats.h"
-#include "server.h"
-#include "channel.h"
-#include "version.h"
-#include "tld.h"
-#include "database.h"
-

modules/statserv/database.h

@@ -1,27 +0,0 @@
-/* NeoStats - IRC Statistical Services 
-** Copyright (c) 1999-2005 Adam Rutter, Justin Hammond, Mark Hetherington
-** http://www.neostats.net/
-**
-**  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 2 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, write to the Free Software
-**  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
-**  USA
-**
-** NeoStats CVS Identification
-** $Id$
-*/
-
-#ifndef _DATABASE_H_
-#define _DATABASE_H_
-
-#endif /* _DATABASE_H_ */

modules/statserv/statserv.vcproj

@@ -123,9 +123,6 @@
 			<File
 				RelativePath=".\channel.c">
 			</File>
-			<File
-				RelativePath=".\database.c">
-			</File>
 			<File
 				RelativePath=".\htmlstats.c">
 			</File>
@@ -164,9 +161,6 @@
 			<File
 				RelativePath=".\channel.h">
 			</File>
-			<File
-				RelativePath=".\database.h">
-			</File>
 			<File
 				RelativePath=".\htmlstats.h">
 			</File>