- 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

diff --git a/src/Makefile.am b/src/Makefile.am
index 575fa487e4bdc697604ba2ad4456e2430281403b..7069b78353a7816fb20053dfbaddd3cf895fb3a8 100644 (file)
--- 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 db4321ef4155b683f96fb1331ad0616969d7e94d..e949e71a35b37645dbcd573cae0bd0b3cdf64b69 100644 (file)
--- 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 24edf465f5848a111cdf2c3e82ead2a5113940cc..07bc6d5b4f19d8fa1da3da40afc4af363b2672a2 100644 (file)
--- a/src/config-lexer.l
+++ b/src/config-lexer.l
@@ -32,7 +32,6 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "inet.h"
 #include "compat.h"
 #include "config.h"
 #include "config-parser.h"

diff --git a/src/firedns.c b/src/firedns.c
index a239b9498b13a7218c18e504ca399e6fbc699307..581a7da2f756f4f51f35141f724da2ca1bc2ac31 100644 (file)
--- 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 <sys/poll.h>
 #include <sys/time.h>
 #include <netinet/in.h>
+#include <arpa/inet.h>
 #include <string.h>
 #include <unistd.h>
 #include <stdio.h>
@@ -36,7 +37,6 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 #include <fcntl.h>
 
 #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 (file)
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 <errno.h>
-#include <stdio.h>
-#include <assert.h>
-#include <string.h>
-#include <stdlib.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-
-#include "setup.h"
-#include "inet.h"
-#include "log.h"

diff --git a/src/inet.h b/src/inet.h
deleted file mode 100644 (file)
index 69634a6..0000000
--- a/src/inet.h
+++ /dev/null
@@ -1,9 +0,0 @@
-#ifndef INET_H
-#define INET_H
-
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-
-#endif /* INET_H */

diff --git a/src/irc.h b/src/irc.h
index a65b353786c5365505d3dfb36450b79265d8a0d2..f42a090bb561bc53f8e3f66d57f31146768b20c0 100644 (file)
--- a/src/irc.h
+++ b/src/irc.h
@@ -1,7 +1,10 @@
 #ifndef IRC_H
 #define IRC_H
 
-#include "inet.h"
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
 
 #define MSGLENMAX 512 + 1
 

diff --git a/src/negcache.c b/src/negcache.c
index 8ce19c10a971ac35eb28141057980657ccbef39b..889266c60c08e39d1ea5a48f2c51b76d1db59a39 100644 (file)
--- 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 dc8c534bda0006eac5098c6119ddbf61281252a7..515b166d0fee5990845c49c2a5186cf2afbd5305 100644 (file)
--- a/src/scan.c
+++ b/src/scan.c
@@ -50,7 +50,6 @@
 # include <sys/poll.h>
 #endif
 
-#include "inet.h"
 #include "compat.h"
 #include "config.h"
 #include "irc.h"