- Removed now unused inet.c and inet.h

git-svn-id: svn://svn.ircd-hybrid.org/svnroot/hopm/branches/1.0.x@5174 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.c b/src/config-lexer.c
index 102c6192eba91b999d97025c7f04f0cfc2a25e66..36794de1933da44e8f89cfba4d12a14541308e19 100644 (file)
--- a/src/config-lexer.c
+++ b/src/config-lexer.c
@@ -760,7 +760,6 @@ char *yytext;
 #include <stdio.h>
 #include <string.h>
 
-#include "inet.h"
 #include "compat.h"
 #include "config.h"
 #include "config-parser.h"
@@ -771,7 +770,7 @@ void ccomment(void);
 int linenum = 1;
 char linebuf[512];
 
-#line 775 "config-lexer.c"
+#line 774 "config-lexer.c"
 
 #define INITIAL 0
 
@@ -978,10 +977,10 @@ YY_DECL
                }
 
        {
-#line 52 "config-lexer.l"
+#line 51 "config-lexer.l"
 
 
-#line 985 "config-lexer.c"
+#line 984 "config-lexer.c"
 
        while ( 1 )             /* loops until end-of-file is reached */
                {
@@ -1046,18 +1045,18 @@ do_action:      /* This label is used only to access EOF actions. */
 
 case 1:
 YY_RULE_SETUP
-#line 54 "config-lexer.l"
+#line 53 "config-lexer.l"
 { ccomment(); }
        YY_BREAK
 case 2:
 YY_RULE_SETUP
-#line 56 "config-lexer.l"
+#line 55 "config-lexer.l"
 ;
        YY_BREAK
 case 3:
 /* rule 3 can match eol */
 YY_RULE_SETUP
-#line 58 "config-lexer.l"
+#line 57 "config-lexer.l"
 {
                            /* QSTRING from Hybrid7. Why re-invent the wheel? */
 
@@ -1099,352 +1098,352 @@ YY_RULE_SETUP
        YY_BREAK
 case 4:
 YY_RULE_SETUP
-#line 97 "config-lexer.l"
+#line 96 "config-lexer.l"
 { return AWAY;         }
        YY_BREAK
 case 5:
 YY_RULE_SETUP
-#line 98 "config-lexer.l"
+#line 97 "config-lexer.l"
 { return BAN_UNKNOWN;  }
        YY_BREAK
 case 6:
 YY_RULE_SETUP
-#line 99 "config-lexer.l"
+#line 98 "config-lexer.l"
 { return BLACKLIST;    }
        YY_BREAK
 case 7:
 YY_RULE_SETUP
-#line 100 "config-lexer.l"
+#line 99 "config-lexer.l"
 { return CHANNEL;      }
        YY_BREAK
 case 8:
 YY_RULE_SETUP
-#line 101 "config-lexer.l"
+#line 100 "config-lexer.l"
 { return CONNREGEX;    }
        YY_BREAK
 case 9:
 YY_RULE_SETUP
-#line 102 "config-lexer.l"
+#line 101 "config-lexer.l"
 { return DNS_FDLIMIT;  }
        YY_BREAK
 case 10:
 YY_RULE_SETUP
-#line 103 "config-lexer.l"
+#line 102 "config-lexer.l"
 { return DNSBL_FROM;   }
        YY_BREAK
 case 11:
 YY_RULE_SETUP
-#line 104 "config-lexer.l"
+#line 103 "config-lexer.l"
 { return DNSBL_TO;     }
        YY_BREAK
 case 12:
 YY_RULE_SETUP
-#line 105 "config-lexer.l"
+#line 104 "config-lexer.l"
 { return EXEMPT;       }
        YY_BREAK
 case 13:
 YY_RULE_SETUP
-#line 106 "config-lexer.l"
+#line 105 "config-lexer.l"
 { return FD;           }
        YY_BREAK
 case 14:
 YY_RULE_SETUP
-#line 107 "config-lexer.l"
+#line 106 "config-lexer.l"
 { return INVITE;       }
        YY_BREAK
 case 15:
 YY_RULE_SETUP
-#line 108 "config-lexer.l"
+#line 107 "config-lexer.l"
 { return IRC;          }
        YY_BREAK
 case 16:
 YY_RULE_SETUP
-#line 109 "config-lexer.l"
+#line 108 "config-lexer.l"
 { return KLINE;        }
        YY_BREAK
 case 17:
 YY_RULE_SETUP
-#line 110 "config-lexer.l"
+#line 109 "config-lexer.l"
 { return KEY;          }
        YY_BREAK
 case 18:
 YY_RULE_SETUP
-#line 111 "config-lexer.l"
+#line 110 "config-lexer.l"
 { return MASK;         }
        YY_BREAK
 case 19:
 YY_RULE_SETUP
-#line 112 "config-lexer.l"
+#line 111 "config-lexer.l"
 { return MAX_READ;     }
        YY_BREAK
 case 20:
 YY_RULE_SETUP
-#line 113 "config-lexer.l"
+#line 112 "config-lexer.l"
 { return MODE;         }
        YY_BREAK
 case 21:
 YY_RULE_SETUP
-#line 114 "config-lexer.l"
+#line 113 "config-lexer.l"
 { return NAME;         }
        YY_BREAK
 case 22:
 YY_RULE_SETUP
-#line 115 "config-lexer.l"
+#line 114 "config-lexer.l"
 { return NEGCACHE;     }
        YY_BREAK
 case 23:
 YY_RULE_SETUP
-#line 116 "config-lexer.l"
+#line 115 "config-lexer.l"
 { return NICK;         }
        YY_BREAK
 case 24:
 YY_RULE_SETUP
-#line 117 "config-lexer.l"
+#line 116 "config-lexer.l"
 { return NICKSERV;     }
        YY_BREAK
 case 25:
 YY_RULE_SETUP
-#line 118 "config-lexer.l"
+#line 117 "config-lexer.l"
 { return OPER;         }
        YY_BREAK
 case 26:
 YY_RULE_SETUP
-#line 119 "config-lexer.l"
+#line 118 "config-lexer.l"
 { return OPM;          }
        YY_BREAK
 case 27:
 YY_RULE_SETUP
-#line 120 "config-lexer.l"
+#line 119 "config-lexer.l"
 { return OPTIONS;      }
        YY_BREAK
 case 28:
 YY_RULE_SETUP
-#line 121 "config-lexer.l"
+#line 120 "config-lexer.l"
 { return PASSWORD;     }
        YY_BREAK
 case 29:
 YY_RULE_SETUP
-#line 122 "config-lexer.l"
+#line 121 "config-lexer.l"
 { return PERFORM;      }
        YY_BREAK
 case 30:
 YY_RULE_SETUP
-#line 123 "config-lexer.l"
+#line 122 "config-lexer.l"
 { return PIDFILE;      }
        YY_BREAK
 case 31:
 YY_RULE_SETUP
-#line 124 "config-lexer.l"
+#line 123 "config-lexer.l"
 { return PORT;         }
        YY_BREAK
 case 32:
 YY_RULE_SETUP
-#line 125 "config-lexer.l"
+#line 124 "config-lexer.l"
 { return PROTOCOL;     }
        YY_BREAK
 case 33:
 YY_RULE_SETUP
-#line 126 "config-lexer.l"
+#line 125 "config-lexer.l"
 { return REALNAME;     }
        YY_BREAK
 case 34:
 YY_RULE_SETUP
-#line 127 "config-lexer.l"
+#line 126 "config-lexer.l"
 { return REPLY;        }
        YY_BREAK
 case 35:
 YY_RULE_SETUP
-#line 128 "config-lexer.l"
+#line 127 "config-lexer.l"
 { return SCANLOG;      }
        YY_BREAK
 case 36:
 YY_RULE_SETUP
-#line 129 "config-lexer.l"
+#line 128 "config-lexer.l"
 { return SCANNER;      }
        YY_BREAK
 case 37:
 YY_RULE_SETUP
-#line 130 "config-lexer.l"
+#line 129 "config-lexer.l"
 { return SENDMAIL;     }
        YY_BREAK
 case 38:
 YY_RULE_SETUP
-#line 131 "config-lexer.l"
+#line 130 "config-lexer.l"
 { return SERVER;       }
        YY_BREAK
 case 39:
 YY_RULE_SETUP
-#line 132 "config-lexer.l"
+#line 131 "config-lexer.l"
 { return TARGET_IP;    }
        YY_BREAK
 case 40:
 YY_RULE_SETUP
-#line 133 "config-lexer.l"
+#line 132 "config-lexer.l"
 { return TARGET_PORT;  }
        YY_BREAK
 case 41:
 YY_RULE_SETUP
-#line 134 "config-lexer.l"
+#line 133 "config-lexer.l"
 { return TARGET_STRING;}
        YY_BREAK
 case 42:
 YY_RULE_SETUP
-#line 135 "config-lexer.l"
+#line 134 "config-lexer.l"
 { return TIMEOUT;      }
        YY_BREAK
 case 43:
 YY_RULE_SETUP
-#line 136 "config-lexer.l"
+#line 135 "config-lexer.l"
 { return TYPE;         }
        YY_BREAK
 case 44:
 YY_RULE_SETUP
-#line 137 "config-lexer.l"
+#line 136 "config-lexer.l"
 { return USER;         }
        YY_BREAK
 case 45:
 YY_RULE_SETUP
-#line 138 "config-lexer.l"
+#line 137 "config-lexer.l"
 { return USERNAME;     }
        YY_BREAK
 case 46:
 YY_RULE_SETUP
-#line 139 "config-lexer.l"
+#line 138 "config-lexer.l"
 { return VHOST;        }
        YY_BREAK
 case 47:
 YY_RULE_SETUP
-#line 141 "config-lexer.l"
+#line 140 "config-lexer.l"
 { return YEARS; }
        YY_BREAK
 case 48:
 YY_RULE_SETUP
-#line 142 "config-lexer.l"
+#line 141 "config-lexer.l"
 { return YEARS; }
        YY_BREAK
 case 49:
 YY_RULE_SETUP
-#line 143 "config-lexer.l"
+#line 142 "config-lexer.l"
 { return MONTHS; }
        YY_BREAK
 case 50:
 YY_RULE_SETUP
-#line 144 "config-lexer.l"
+#line 143 "config-lexer.l"
 { return MONTHS; }
        YY_BREAK
 case 51:
 YY_RULE_SETUP
-#line 145 "config-lexer.l"
+#line 144 "config-lexer.l"
 { return WEEKS; }
        YY_BREAK
 case 52:
 YY_RULE_SETUP
-#line 146 "config-lexer.l"
+#line 145 "config-lexer.l"
 { return WEEKS; }
        YY_BREAK
 case 53:
 YY_RULE_SETUP
-#line 147 "config-lexer.l"
+#line 146 "config-lexer.l"
 { return DAYS; }
        YY_BREAK
 case 54:
 YY_RULE_SETUP
-#line 148 "config-lexer.l"
+#line 147 "config-lexer.l"
 { return DAYS; }
        YY_BREAK
 case 55:
 YY_RULE_SETUP
-#line 149 "config-lexer.l"
+#line 148 "config-lexer.l"
 { return HOURS; }
        YY_BREAK
 case 56:
 YY_RULE_SETUP
-#line 150 "config-lexer.l"
+#line 149 "config-lexer.l"
 { return HOURS; }
        YY_BREAK
 case 57:
 YY_RULE_SETUP
-#line 151 "config-lexer.l"
+#line 150 "config-lexer.l"
 { return MINUTES; }
        YY_BREAK
 case 58:
 YY_RULE_SETUP
-#line 152 "config-lexer.l"
+#line 151 "config-lexer.l"
 { return MINUTES; }
        YY_BREAK
 case 59:
 YY_RULE_SETUP
-#line 153 "config-lexer.l"
+#line 152 "config-lexer.l"
 { return SECONDS; }
        YY_BREAK
 case 60:
 YY_RULE_SETUP
-#line 154 "config-lexer.l"
+#line 153 "config-lexer.l"
 { return SECONDS; }
        YY_BREAK
 case 61:
 YY_RULE_SETUP
-#line 156 "config-lexer.l"
+#line 155 "config-lexer.l"
 { return BYTES; }
        YY_BREAK
 case 62:
 YY_RULE_SETUP
-#line 157 "config-lexer.l"
+#line 156 "config-lexer.l"
 { return BYTES; }
        YY_BREAK
 case 63:
 YY_RULE_SETUP
-#line 158 "config-lexer.l"
+#line 157 "config-lexer.l"
 { return KBYTES; }
        YY_BREAK
 case 64:
 YY_RULE_SETUP
-#line 159 "config-lexer.l"
+#line 158 "config-lexer.l"
 { return KBYTES; }
        YY_BREAK
 case 65:
 YY_RULE_SETUP
-#line 160 "config-lexer.l"
+#line 159 "config-lexer.l"
 { return KBYTES; }
        YY_BREAK
 case 66:
 YY_RULE_SETUP
-#line 161 "config-lexer.l"
+#line 160 "config-lexer.l"
 { return KBYTES; }
        YY_BREAK
 case 67:
 YY_RULE_SETUP
-#line 162 "config-lexer.l"
+#line 161 "config-lexer.l"
 { return KBYTES; }
        YY_BREAK
 case 68:
 YY_RULE_SETUP
-#line 163 "config-lexer.l"
+#line 162 "config-lexer.l"
 { return MBYTES; }
        YY_BREAK
 case 69:
 YY_RULE_SETUP
-#line 164 "config-lexer.l"
+#line 163 "config-lexer.l"
 { return MBYTES; }
        YY_BREAK
 case 70:
 YY_RULE_SETUP
-#line 165 "config-lexer.l"
+#line 164 "config-lexer.l"
 { return MBYTES; }
        YY_BREAK
 case 71:
 YY_RULE_SETUP
-#line 166 "config-lexer.l"
+#line 165 "config-lexer.l"
 { return MBYTES; }
        YY_BREAK
 case 72:
 YY_RULE_SETUP
-#line 167 "config-lexer.l"
+#line 166 "config-lexer.l"
 { return MBYTES; }
        YY_BREAK
 case 73:
 YY_RULE_SETUP
-#line 169 "config-lexer.l"
+#line 168 "config-lexer.l"
 {
                           yylval.number = OPM_TYPE_HTTP;
                           return PROTOCOLTYPE;
@@ -1452,7 +1451,7 @@ YY_RULE_SETUP
        YY_BREAK
 case 74:
 YY_RULE_SETUP
-#line 174 "config-lexer.l"
+#line 173 "config-lexer.l"
 {
                           yylval.number = OPM_TYPE_HTTPPOST;
                           return PROTOCOLTYPE;
@@ -1460,7 +1459,7 @@ YY_RULE_SETUP
        YY_BREAK
 case 75:
 YY_RULE_SETUP
-#line 179 "config-lexer.l"
+#line 178 "config-lexer.l"
 {
                           yylval.number = OPM_TYPE_SOCKS4;
                           return PROTOCOLTYPE;
@@ -1468,7 +1467,7 @@ YY_RULE_SETUP
        YY_BREAK
 case 76:
 YY_RULE_SETUP
-#line 184 "config-lexer.l"
+#line 183 "config-lexer.l"
 {
                           yylval.number = OPM_TYPE_SOCKS5;
                           return PROTOCOLTYPE;
@@ -1476,7 +1475,7 @@ YY_RULE_SETUP
        YY_BREAK
 case 77:
 YY_RULE_SETUP
-#line 189 "config-lexer.l"
+#line 188 "config-lexer.l"
 {
                           yylval.number = OPM_TYPE_WINGATE;
                           return PROTOCOLTYPE;
@@ -1484,7 +1483,7 @@ YY_RULE_SETUP
        YY_BREAK
 case 78:
 YY_RULE_SETUP
-#line 194 "config-lexer.l"
+#line 193 "config-lexer.l"
 {
                           yylval.number = OPM_TYPE_ROUTER;
                           return PROTOCOLTYPE;
@@ -1492,7 +1491,7 @@ YY_RULE_SETUP
        YY_BREAK
 case 79:
 YY_RULE_SETUP
-#line 200 "config-lexer.l"
+#line 199 "config-lexer.l"
 {
                            yylval.number=atoi(yytext); 
                            return NUMBER;
@@ -1500,7 +1499,7 @@ YY_RULE_SETUP
        YY_BREAK
 case 80:
 YY_RULE_SETUP
-#line 209 "config-lexer.l"
+#line 208 "config-lexer.l"
 {
                            yylval.number=1;
                            return NUMBER;
@@ -1508,7 +1507,7 @@ YY_RULE_SETUP
        YY_BREAK
 case 81:
 YY_RULE_SETUP
-#line 213 "config-lexer.l"
+#line 212 "config-lexer.l"
 {
                            yylval.number=1;
                            return NUMBER;
@@ -1516,7 +1515,7 @@ YY_RULE_SETUP
        YY_BREAK
 case 82:
 YY_RULE_SETUP
-#line 217 "config-lexer.l"
+#line 216 "config-lexer.l"
 {
                            yylval.number=1;
                            return NUMBER;
@@ -1524,7 +1523,7 @@ YY_RULE_SETUP
        YY_BREAK
 case 83:
 YY_RULE_SETUP
-#line 224 "config-lexer.l"
+#line 223 "config-lexer.l"
 {
                            yylval.number=0;
                            return NUMBER;
@@ -1532,7 +1531,7 @@ YY_RULE_SETUP
        YY_BREAK
 case 84:
 YY_RULE_SETUP
-#line 229 "config-lexer.l"
+#line 228 "config-lexer.l"
 {
                            yylval.number=0;
                            return NUMBER;
@@ -1540,7 +1539,7 @@ YY_RULE_SETUP
        YY_BREAK
 case 85:
 YY_RULE_SETUP
-#line 234 "config-lexer.l"
+#line 233 "config-lexer.l"
 {
                            yylval.number=0;
                            return NUMBER;
@@ -1549,7 +1548,7 @@ YY_RULE_SETUP
 case 86:
 /* rule 86 can match eol */
 YY_RULE_SETUP
-#line 240 "config-lexer.l"
+#line 239 "config-lexer.l"
 {
                            strlcpy(linebuf, yytext + 1, sizeof(linebuf));
                            ++linenum;
@@ -1558,20 +1557,20 @@ YY_RULE_SETUP
        YY_BREAK
 case 87:
 YY_RULE_SETUP
-#line 246 "config-lexer.l"
+#line 245 "config-lexer.l"
 /* ignore whitespace */;
        YY_BREAK
 case 88:
 YY_RULE_SETUP
-#line 248 "config-lexer.l"
+#line 247 "config-lexer.l"
 return yytext[0]; 
        YY_BREAK
 case 89:
 YY_RULE_SETUP
-#line 250 "config-lexer.l"
+#line 249 "config-lexer.l"
 ECHO;
        YY_BREAK
-#line 1575 "config-lexer.c"
+#line 1574 "config-lexer.c"
 case YY_STATE_EOF(INITIAL):
        yyterminate();
 
@@ -2529,7 +2528,7 @@ void yyfree (void * ptr )
 
 #define YYTABLES_NAME "yytables"
 
-#line 250 "config-lexer.l"
+#line 249 "config-lexer.l"
 
 
 

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"