From 3c50c80ecacbe7de92556087ed7bf01f10111995 Mon Sep 17 00:00:00 2001 From: michael Date: Fri, 26 Dec 2014 21:09:41 +0000 Subject: [PATCH] - Removed now unused inet.c and inet.h git-svn-id: svn://svn.ircd-hybrid.org/svnroot/hopm/trunk@5175 82007160-df01-0410-b94d-b575c5fd34c7 --- src/Makefile.am | 4 +--- src/Makefile.in | 17 +++++++---------- src/config-lexer.l | 1 - src/firedns.c | 2 +- src/inet.c | 39 --------------------------------------- src/inet.h | 9 --------- src/irc.h | 5 ++++- src/negcache.c | 1 - src/scan.c | 1 - 9 files changed, 13 insertions(+), 66 deletions(-) delete mode 100644 src/inet.c delete mode 100644 src/inet.h diff --git a/src/Makefile.am b/src/Makefile.am index 575fa48..7069b78 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -8,15 +8,13 @@ hopm_SOURCES = compat.c \ compat.h \ config.c \ config.h \ - config-lexer.l \ config-parser.y \ + config-lexer.l \ dnsbl.c \ dnsbl.h \ extern.h \ firedns.c \ firedns.h \ - inet.c \ - inet.h \ irc.c \ irc.h \ list.c \ diff --git a/src/Makefile.in b/src/Makefile.in index db4321e..e949e71 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -82,7 +82,7 @@ bin_PROGRAMS = hopm$(EXEEXT) subdir = src DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ $(srcdir)/setup.h.in $(top_srcdir)/mkinstalldirs \ - config-lexer.c config-parser.h config-parser.c \ + config-parser.h config-parser.c config-lexer.c \ $(top_srcdir)/depcomp $(top_srcdir)/ylwrap ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/configure.ac @@ -95,11 +95,11 @@ CONFIG_CLEAN_VPATH_FILES = am__installdirs = "$(DESTDIR)$(bindir)" PROGRAMS = $(bin_PROGRAMS) am_hopm_OBJECTS = compat.$(OBJEXT) config.$(OBJEXT) \ - config-lexer.$(OBJEXT) config-parser.$(OBJEXT) dnsbl.$(OBJEXT) \ - firedns.$(OBJEXT) inet.$(OBJEXT) irc.$(OBJEXT) list.$(OBJEXT) \ - log.$(OBJEXT) main.$(OBJEXT) malloc.$(OBJEXT) match.$(OBJEXT) \ - misc.$(OBJEXT) negcache.$(OBJEXT) opercmd.$(OBJEXT) \ - scan.$(OBJEXT) stats.$(OBJEXT) + config-parser.$(OBJEXT) config-lexer.$(OBJEXT) dnsbl.$(OBJEXT) \ + firedns.$(OBJEXT) irc.$(OBJEXT) list.$(OBJEXT) log.$(OBJEXT) \ + main.$(OBJEXT) malloc.$(OBJEXT) match.$(OBJEXT) misc.$(OBJEXT) \ + negcache.$(OBJEXT) opercmd.$(OBJEXT) scan.$(OBJEXT) \ + stats.$(OBJEXT) hopm_OBJECTS = $(am_hopm_OBJECTS) hopm_DEPENDENCIES = libopm/src/.libs/libopm.a @LIBOBJS@ AM_V_lt = $(am__v_lt_@AM_V@) @@ -357,15 +357,13 @@ hopm_SOURCES = compat.c \ compat.h \ config.c \ config.h \ - config-lexer.l \ config-parser.y \ + config-lexer.l \ dnsbl.c \ dnsbl.h \ extern.h \ firedns.c \ firedns.h \ - inet.c \ - inet.h \ irc.c \ irc.h \ list.c \ @@ -511,7 +509,6 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/config.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dnsbl.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/firedns.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/inet.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/irc.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/list.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/log.Po@am__quote@ diff --git a/src/config-lexer.l b/src/config-lexer.l index 24edf46..07bc6d5 100644 --- a/src/config-lexer.l +++ b/src/config-lexer.l @@ -32,7 +32,6 @@ #include #include -#include "inet.h" #include "compat.h" #include "config.h" #include "config-parser.h" diff --git a/src/firedns.c b/src/firedns.c index a239b94..581a7da 100644 --- a/src/firedns.c +++ b/src/firedns.c @@ -29,6 +29,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #include #include #include +#include #include #include #include @@ -36,7 +37,6 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #include #include "compat.h" -#include "inet.h" #include "malloc.h" #include "firedns.h" #include "config.h" diff --git a/src/inet.c b/src/inet.c deleted file mode 100644 index 9269ec4..0000000 --- a/src/inet.c +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright (C) 2002 by the past and present ircd coders, and others. - -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. - -*/ - -/* - * This code is borrowed from ircd-hybrid version 7 - * -TimeMr14C - */ - -#include -#include -#include -#include -#include -#include -#include -#include - -#include "setup.h" -#include "inet.h" -#include "log.h" diff --git a/src/inet.h b/src/inet.h deleted file mode 100644 index 69634a6..0000000 --- a/src/inet.h +++ /dev/null @@ -1,9 +0,0 @@ -#ifndef INET_H -#define INET_H - -#include -#include -#include -#include - -#endif /* INET_H */ diff --git a/src/irc.h b/src/irc.h index a65b353..f42a090 100644 --- a/src/irc.h +++ b/src/irc.h @@ -1,7 +1,10 @@ #ifndef IRC_H #define IRC_H -#include "inet.h" +#include +#include +#include +#include #define MSGLENMAX 512 + 1 diff --git a/src/negcache.c b/src/negcache.c index 8ce19c1..889266c 100644 --- a/src/negcache.c +++ b/src/negcache.c @@ -57,7 +57,6 @@ along with this program; if not, write to: # endif #endif -#include "inet.h" #include "irc.h" #include "negcache.h" #include "config.h" diff --git a/src/scan.c b/src/scan.c index dc8c534..515b166 100644 --- a/src/scan.c +++ b/src/scan.c @@ -50,7 +50,6 @@ # include #endif -#include "inet.h" #include "compat.h" #include "config.h" #include "irc.h" -- 2.30.2