From 39edbd643d23aac177ec4e52f3b615e32894c990 Mon Sep 17 00:00:00 2001 From: Bram Matthys Date: Sat, 11 Sep 2021 10:26:18 +0200 Subject: [PATCH] Get rid of proto.h and integrate the 20 lines into h.h. --- include/h.h | 20 +++++++++ include/proto.h | 68 ------------------------------- include/unrealircd.h | 1 - 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 +- 10 files changed, 27 insertions(+), 76 deletions(-) delete mode 100644 include/proto.h diff --git a/include/h.h b/include/h.h index 0c70206b5..f19be7ed6 100644 --- a/include/h.h +++ b/include/h.h @@ -1122,3 +1122,23 @@ extern void download_file_async(const char *url, time_t cachetime, vFP callback, extern void url_init(void); extern EVENT(url_socket_timeout); /* end of url stuff */ +extern char *collapse(char *pattern); +extern void clear_scache_hash_table(void); +extern void sendto_one(Client *, MessageTag *mtags, FORMAT_STRING(const char *), ...) __attribute__((format(printf,3,4))); +extern void sendto_realops(FORMAT_STRING(const char *pattern), ...) __attribute__((format(printf,1,2))); +extern EVENT(garbage_collect); +extern EVENT(loop_event); +extern EVENT(check_pings); +extern EVENT(handshake_timeout); +extern EVENT(check_deadsockets); +extern EVENT(try_connections); +extern const char *my_itoa(int i); +extern void load_tunefile(void); +extern EVENT(save_tunefile); +extern void read_motd(const char *filename, MOTDFile *motd); +extern int target_limit_exceeded(Client *client, void *target, const char *name); +extern void make_umodestr(void); +extern const char *get_usermode_string(Client *acptr); +extern void initwhowas(void); +extern void uid_init(void); +extern const char *uid_get(void); diff --git a/include/proto.h b/include/proto.h deleted file mode 100644 index d5d2d5c19..000000000 --- a/include/proto.h +++ /dev/null @@ -1,68 +0,0 @@ -/************************************************************************ - * Unreal Internet Relay Chat Daemon, include/proto.h - * (C) Dominick Meglio 2000 - * - * See file AUTHORS in IRC package for additional names of - * the programmers. - * - * 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. - */ - -#ifndef proto_h -#define proto_h -/* lusers.c */ -extern void init_irccounts(void); - -/* match.c */ -extern char *collapse(char *pattern); - -/* scache.c */ -extern void clear_scache_hash_table(void); - -/* send.c */ -extern void sendto_one(Client *, MessageTag *mtags, FORMAT_STRING(const char *), ...) __attribute__((format(printf,3,4))); -extern void sendto_realops(FORMAT_STRING(const char *pattern), ...) __attribute__((format(printf,1,2))); - -/* ircd.c */ -extern EVENT(garbage_collect); -extern EVENT(loop_event); -extern EVENT(check_pings); -extern EVENT(handshake_timeout); -extern EVENT(check_deadsockets); -extern EVENT(try_connections); -/* support.c */ -extern const char *my_itoa(int i); - -/* s_serv.c */ -extern void load_tunefile(void); -extern EVENT(save_tunefile); -extern void read_motd(const char *filename, MOTDFile *motd); - -/* s_user.c */ -extern int target_limit_exceeded(Client *client, void *target, const char *name); -extern void make_umodestr(void); -extern const char *get_usermode_string(Client *acptr); - -/* s_misc.c */ -extern char *convert_time(time_t ltime); - -/* whowas.c */ -extern void initwhowas(void); - -/* uid.c */ -extern void uid_init(void); -extern const char *uid_get(void); - -#endif /* proto_h */ diff --git a/include/unrealircd.h b/include/unrealircd.h index 87b9c2941..abd67c761 100644 --- a/include/unrealircd.h +++ b/include/unrealircd.h @@ -10,7 +10,6 @@ #include "numeric.h" #include "msg.h" #include "mempool.h" -#include "proto.h" #include "channel.h" #include #include diff --git a/src/Makefile.in b/src/Makefile.in index dc1a09ad8..00407857d 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -48,7 +48,7 @@ INCLUDES = ../include/channel.h \ ../include/ircsprintf.h \ ../include/license.h \ ../include/modules.h ../include/modversion.h ../include/msg.h \ - ../include/numeric.h ../include/proto.h \ + ../include/numeric.h \ ../include/resource.h ../include/setup.h \ ../include/struct.h ../include/sys.h \ ../include/types.h \ diff --git a/src/modules/Makefile.in b/src/modules/Makefile.in index f451ac186..278ff6157 100644 --- a/src/modules/Makefile.in +++ b/src/modules/Makefile.in @@ -28,7 +28,7 @@ INCLUDES = ../include/channel.h \ ../include/ircsprintf.h \ ../include/license.h \ ../include/modules.h ../include/modversion.h ../include/msg.h \ - ../include/numeric.h ../include/proto.h ../include/dns.h \ + ../include/numeric.h ../include/dns.h \ ../include/resource.h ../include/setup.h \ ../include/struct.h ../include/sys.h \ ../include/types.h \ diff --git a/src/modules/chanmodes/Makefile.in b/src/modules/chanmodes/Makefile.in index 32f9da1a5..0ecc7ef0a 100644 --- a/src/modules/chanmodes/Makefile.in +++ b/src/modules/chanmodes/Makefile.in @@ -25,7 +25,7 @@ INCLUDES = ../../include/channel.h \ ../../include/ircsprintf.h \ ../../include/license.h \ ../../include/modules.h ../../include/modversion.h ../../include/msg.h \ - ../../include/numeric.h ../../include/proto.h ../../include/dns.h \ + ../../include/numeric.h ../../include/dns.h \ ../../include/resource.h ../../include/setup.h \ ../../include/struct.h ../../include/sys.h \ ../../include/types.h \ diff --git a/src/modules/extbans/Makefile.in b/src/modules/extbans/Makefile.in index f13f79016..26ea7cf14 100644 --- a/src/modules/extbans/Makefile.in +++ b/src/modules/extbans/Makefile.in @@ -25,7 +25,7 @@ INCLUDES = ../../include/channel.h \ ../../include/ircsprintf.h \ ../../include/license.h \ ../../include/modules.h ../../include/modversion.h ../../include/msg.h \ - ../../include/numeric.h ../../include/proto.h ../../include/dns.h \ + ../../include/numeric.h ../../include/dns.h \ ../../include/resource.h ../../include/setup.h \ ../../include/struct.h ../../include/sys.h \ ../../include/types.h \ diff --git a/src/modules/snomasks/Makefile.in b/src/modules/snomasks/Makefile.in index b68cc7391..aba643def 100644 --- a/src/modules/snomasks/Makefile.in +++ b/src/modules/snomasks/Makefile.in @@ -25,7 +25,7 @@ INCLUDES = ../../include/channel.h \ ../../include/ircsprintf.h \ ../../include/license.h \ ../../include/modules.h ../../include/modversion.h ../../include/msg.h \ - ../../include/numeric.h ../../include/proto.h ../../include/dns.h \ + ../../include/numeric.h ../../include/dns.h \ ../../include/resource.h ../../include/setup.h \ ../../include/struct.h ../../include/sys.h \ ../../include/types.h \ diff --git a/src/modules/third/Makefile.in b/src/modules/third/Makefile.in index 13128e88c..cff2940b6 100644 --- a/src/modules/third/Makefile.in +++ b/src/modules/third/Makefile.in @@ -25,7 +25,7 @@ INCLUDES = ../../include/channel.h \ ../../include/ircsprintf.h \ ../../include/license.h \ ../../include/modules.h ../../include/modversion.h ../../include/msg.h \ - ../../include/numeric.h ../../include/proto.h ../../include/dns.h \ + ../../include/numeric.h ../../include/dns.h \ ../../include/resource.h ../../include/setup.h \ ../../include/struct.h ../../include/sys.h \ ../../include/types.h \ diff --git a/src/modules/usermodes/Makefile.in b/src/modules/usermodes/Makefile.in index c51695542..d4ed96b0f 100644 --- a/src/modules/usermodes/Makefile.in +++ b/src/modules/usermodes/Makefile.in @@ -25,7 +25,7 @@ INCLUDES = ../../include/channel.h \ ../../include/ircsprintf.h \ ../../include/license.h \ ../../include/modules.h ../../include/modversion.h ../../include/msg.h \ - ../../include/numeric.h ../../include/proto.h ../../include/dns.h \ + ../../include/numeric.h ../../include/dns.h \ ../../include/resource.h ../../include/setup.h \ ../../include/struct.h ../../include/sys.h \ ../../include/types.h \