From c673e5bbc6ddeecc82a9d1102f3b5db3ee159f18 Mon Sep 17 00:00:00 2001 From: Bram Matthys Date: Wed, 26 Jun 2019 17:17:20 +0200 Subject: [PATCH] Get rid of now meaningless include/hash.h --- include/h.h | 9 +++++++++ include/hash.h | 33 ------------------------------- include/struct.h | 1 - makefile.win32 | 2 +- src/Makefile.in | 2 +- src/modules/Makefile.in | 2 +- src/modules/chanmodes/Makefile.in | 2 +- src/modules/extbans/Makefile.in | 2 +- src/modules/snomasks/Makefile.in | 2 +- src/modules/third/Makefile.in | 2 +- src/modules/usermodes/Makefile.in | 2 +- 11 files changed, 17 insertions(+), 42 deletions(-) delete mode 100644 include/hash.h diff --git a/include/h.h b/include/h.h index 096116172..3ec4a48e2 100644 --- a/include/h.h +++ b/include/h.h @@ -368,6 +368,13 @@ extern time_t timeout_query_list(time_t); extern time_t expire_cache(time_t); extern void del_queries(char *); +/* Hash stuff */ +#define NICK_HASH_TABLE_SIZE 32768 +#define CHAN_HASH_TABLE_SIZE 32768 +#define WATCH_HASH_TABLE_SIZE 32768 +#define WHOWAS_HASH_TABLE_SIZE 32768 +#define THROTTLING_HASH_TABLE_SIZE 8192 +#define find_channel hash_find_channel extern uint64_t siphash(const char *in, const char *k); extern uint64_t siphash_raw(const char *in, size_t len, const char *k); extern uint64_t siphash_nocase(const char *in, const char *k); @@ -390,8 +397,10 @@ extern aChannel *hash_get_chan_bucket(uint64_t); extern aClient *hash_find_client(const char *, aClient *); extern aClient *hash_find_id(const char *, aClient *); extern aClient *hash_find_nickatserver(const char *, aClient *); +extern aChannel *hash_find_channel(char *name, aChannel *chptr); extern aClient *hash_find_server(const char *, aClient *); extern struct MODVAR ThrottlingBucket *ThrottlingHash[THROTTLING_HASH_TABLE_SIZE]; + extern char *find_by_aln(char *); extern char *convert2aln(int); extern int convertfromaln(char *); diff --git a/include/hash.h b/include/hash.h deleted file mode 100644 index 4846f84aa..000000000 --- a/include/hash.h +++ /dev/null @@ -1,33 +0,0 @@ -/************************************************************************ - * Unreal Internet Relay Chat Daemon, include/hash.h - * Copyright (C) 1991 Darren Reed - * - * 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 1, 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., 675 Mass Ave, Cambridge, MA 02139, USA. - * - * $Id$ - */ - -#ifndef __hash_include__ -#define __hash_include__ - -#define NICK_HASH_TABLE_SIZE 32768 -#define CHAN_HASH_TABLE_SIZE 32768 -#define WATCH_HASH_TABLE_SIZE 32768 -#define WHOWAS_HASH_TABLE_SIZE 32768 -#define THROTTLING_HASH_TABLE_SIZE 8192 - -#define find_channel hash_find_channel - -#endif /* __hash_include__ */ diff --git a/include/struct.h b/include/struct.h index 12379d326..7800b4e5e 100644 --- a/include/struct.h +++ b/include/struct.h @@ -41,7 +41,6 @@ #include #include "common.h" #include "sys.h" -#include "hash.h" #include #include #ifndef _WIN32 diff --git a/makefile.win32 b/makefile.win32 index 654c9eb9e..f150cf782 100644 --- a/makefile.win32 +++ b/makefile.win32 @@ -420,7 +420,7 @@ src/s_numeric.obj: src/s_numeric.c $(INCLUDES) ./include/dbuf.h src/whowas.obj: src/whowas.c $(INCLUDES) ./include/dbuf.h ./include/whowas.h $(CC) $(CFLAGS) src/whowas.c -src/hash.obj: src/hash.c $(INCLUDES) ./include/hash.h +src/hash.obj: src/hash.c $(INCLUDES) $(CC) $(CFLAGS) src/hash.c src/crule.obj: src/crule.c $(INCLUDES) diff --git a/src/Makefile.in b/src/Makefile.in index cc7442e75..d3441eda7 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -42,7 +42,7 @@ BINLDFLAGS=@DYNAMIC_LDFLAGS@ @HARDEN_BINLDFLAGS@ INCLUDES = ../include/auth.h ../include/channel.h \ ../include/class.h ../include/common.h ../include/config.h ../include/dbuf.h \ ../include/dynconf.h ../include/fdlist.h ../include/h.h \ - ../include/hash.h ../include/inet.h ../include/ircsprintf.h \ + ../include/inet.h ../include/ircsprintf.h \ ../include/license.h \ ../include/modules.h ../include/modversion.h ../include/msg.h \ ../include/numeric.h ../include/proto.h \ diff --git a/src/modules/Makefile.in b/src/modules/Makefile.in index 9b5a46d7b..674db6383 100644 --- a/src/modules/Makefile.in +++ b/src/modules/Makefile.in @@ -25,7 +25,7 @@ CC = "==== DO NOT RUN MAKE FROM THIS DIRECTORY ====" INCLUDES = ../include/auth.h ../include/channel.h \ ../include/class.h ../include/common.h ../include/config.h ../include/dbuf.h \ ../include/dynconf.h ../include/fdlist.h ../include/h.h \ - ../include/hash.h ../include/inet.h ../include/ircsprintf.h \ + ../include/inet.h ../include/ircsprintf.h \ ../include/license.h \ ../include/modules.h ../include/modversion.h ../include/msg.h \ ../include/numeric.h ../include/proto.h ../include/res.h \ diff --git a/src/modules/chanmodes/Makefile.in b/src/modules/chanmodes/Makefile.in index 832eaf4db..409360bd3 100644 --- a/src/modules/chanmodes/Makefile.in +++ b/src/modules/chanmodes/Makefile.in @@ -22,7 +22,7 @@ CC = "==== DO NOT RUN MAKE FROM THIS DIRECTORY ====" INCLUDES = ../../include/auth.h ../../include/channel.h \ ../../include/class.h ../../include/common.h ../../include/config.h ../../include/dbuf.h \ ../../include/dynconf.h ../../include/fdlist.h ../../include/h.h \ - ../../include/hash.h ../../include/inet.h ../../include/ircsprintf.h \ + ../../include/inet.h ../../include/ircsprintf.h \ ../../include/license.h \ ../../include/modules.h ../../include/modversion.h ../../include/msg.h \ ../../include/numeric.h ../../include/proto.h ../../include/res.h \ diff --git a/src/modules/extbans/Makefile.in b/src/modules/extbans/Makefile.in index 061e2e0d8..e6d673e3b 100644 --- a/src/modules/extbans/Makefile.in +++ b/src/modules/extbans/Makefile.in @@ -22,7 +22,7 @@ CC = "==== DO NOT RUN MAKE FROM THIS DIRECTORY ====" INCLUDES = ../../include/auth.h ../../include/channel.h \ ../../include/class.h ../../include/common.h ../../include/config.h ../../include/dbuf.h \ ../../include/dynconf.h ../../include/fdlist.h ../../include/h.h \ - ../../include/hash.h ../../include/inet.h ../../include/ircsprintf.h \ + ../../include/inet.h ../../include/ircsprintf.h \ ../../include/license.h \ ../../include/modules.h ../../include/modversion.h ../../include/msg.h \ ../../include/numeric.h ../../include/proto.h ../../include/res.h \ diff --git a/src/modules/snomasks/Makefile.in b/src/modules/snomasks/Makefile.in index 0134f72f5..d974e7745 100644 --- a/src/modules/snomasks/Makefile.in +++ b/src/modules/snomasks/Makefile.in @@ -22,7 +22,7 @@ CC = "==== DO NOT RUN MAKE FROM THIS DIRECTORY ====" INCLUDES = ../../include/auth.h ../../include/channel.h \ ../../include/class.h ../../include/common.h ../../include/config.h ../../include/dbuf.h \ ../../include/dynconf.h ../../include/fdlist.h ../../include/h.h \ - ../../include/hash.h ../../include/inet.h ../../include/ircsprintf.h \ + ../../include/inet.h ../../include/ircsprintf.h \ ../../include/license.h \ ../../include/modules.h ../../include/modversion.h ../../include/msg.h \ ../../include/numeric.h ../../include/proto.h ../../include/res.h \ diff --git a/src/modules/third/Makefile.in b/src/modules/third/Makefile.in index 485ed7e9f..91a2b0463 100644 --- a/src/modules/third/Makefile.in +++ b/src/modules/third/Makefile.in @@ -22,7 +22,7 @@ CC = "==== DO NOT RUN MAKE FROM THIS DIRECTORY ====" INCLUDES = ../../include/auth.h ../../include/channel.h \ ../../include/class.h ../../include/common.h ../../include/config.h ../../include/dbuf.h \ ../../include/dynconf.h ../../include/fdlist.h ../../include/h.h \ - ../../include/hash.h ../../include/inet.h ../../include/ircsprintf.h \ + ../../include/inet.h ../../include/ircsprintf.h \ ../../include/license.h \ ../../include/modules.h ../../include/modversion.h ../../include/msg.h \ ../../include/numeric.h ../../include/proto.h ../../include/res.h \ diff --git a/src/modules/usermodes/Makefile.in b/src/modules/usermodes/Makefile.in index bd1997210..7c1ebe914 100644 --- a/src/modules/usermodes/Makefile.in +++ b/src/modules/usermodes/Makefile.in @@ -22,7 +22,7 @@ CC = "==== DO NOT RUN MAKE FROM THIS DIRECTORY ====" INCLUDES = ../../include/auth.h ../../include/channel.h \ ../../include/class.h ../../include/common.h ../../include/config.h ../../include/dbuf.h \ ../../include/dynconf.h ../../include/fdlist.h ../../include/h.h \ - ../../include/hash.h ../../include/inet.h ../../include/ircsprintf.h \ + ../../include/inet.h ../../include/ircsprintf.h \ ../../include/license.h \ ../../include/modules.h ../../include/modversion.h ../../include/msg.h \ ../../include/numeric.h ../../include/proto.h ../../include/res.h \