From 6a356f7e2de2d73710c797bcc9b09652f51b06b2 Mon Sep 17 00:00:00 2001 From: codemastr Date: Fri, 8 Sep 2000 21:58:11 +0000 Subject: [PATCH] fixed -Wall warnings --- Changes | 2 ++ include/proto.h | 10 ++++++++++ src/channel.c | 45 +++++++-------------------------------------- src/chkconf.c | 1 + src/cloak.c | 3 ++- src/dynconf.c | 2 ++ src/hash.c | 1 + src/res.c | 1 + src/s_auth.c | 1 + src/s_bsd.c | 2 ++ src/s_conf.c | 1 + src/s_err.c | 2 +- src/s_misc.c | 1 + src/s_numeric.c | 1 + src/s_serv.c | 2 +- src/scache.c | 1 + src/send.c | 2 +- src/support.c | 1 + src/webtv.c | 1 + src/whowas.c | 3 ++- 20 files changed, 40 insertions(+), 43 deletions(-) diff --git a/Changes b/Changes index 61f259a4d..6e7eb2379 100644 --- a/Changes +++ b/Changes @@ -620,3 +620,5 @@ - When you set -I which on a chan it sends a JOIN to the rest of the channel - Net/TechAdmins now receive a JOIN/PART when you JOIN/PART a channel - Net/TechAdmins can now see +I users in /names +- Fixed a typo in s_err.c reported by TRON +- Fixed more -Wall warnings diff --git a/include/proto.h b/include/proto.h index 9fe78d92a..2e25af639 100644 --- a/include/proto.h +++ b/include/proto.h @@ -20,6 +20,8 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ +#ifndef proto_h +#define proto_h /* badwords.c */ int loadbadwords_message PROTO((char *wordfile)); int loadbadwords_channel PROTO((char *wordfile)); @@ -50,6 +52,7 @@ void sendto_chanops_butone PROTO((aClient *one, aChannel *chptr, char *pattern, void sendto_realops PROTO((char *pattern, ...)); void sendto_serv_butone_token PROTO((aClient *one, char *prefix, char *command, char *token, char *pattern, ...)); void sendto_serv_butone_token_opt PROTO((aClient *one, int opt, char *prefix, char *command, char *token, char *pattern, ...)); +void sendto_channel_ntadmins PROTO((aClient *from, aChannel *chptr, char *pattern, ...)); /* support.c */ char *my_itoa PROTO((int i)); @@ -85,5 +88,12 @@ void unrealmanual PROTO((void)); int check_for_target_limit PROTO((aClient *sptr, void *target, const char *name)); void make_umodestr PROTO((void)); +/* webtv.c */ +int is_halfop PROTO((aClient *cptr, aChannel *chptr)); +int is_chanprot PROTO((aClient *cptr, aChannel *chptr)); +char *convert_time PROTO((time_t ltime)); +char *get_mode_str PROTO((aClient *acptr)); + /* whowas.c */ void initwhowas PROTO((void)); +#endif /* proto_h */ diff --git a/src/channel.c b/src/channel.c index 068daed4e..31b595eb4 100644 --- a/src/channel.c +++ b/src/channel.c @@ -47,6 +47,7 @@ #include "hash.h" /* For CHANNELHASHSIZE */ #include "h.h" #include "proto.h" +#include ID_Copyright ("(C) 1990 University of Oulu, Computing Center and Jarkko Oikarinen"); @@ -81,7 +82,6 @@ static int channel_link PROTO((aClient *, aClient *, int, char **)); static void channel_modes PROTO((aClient *, char *, char *, aChannel *)); static int check_channelmask PROTO((aClient *, aClient *, char *)); static int del_banid PROTO((aChannel *, char *)); -static int find_banid PROTO((aChannel *, char *)); static void set_mode PROTO((aChannel *, aClient *, int, char **, u_int *, char[MAXMODEPARAMS][MODEBUFLEN + 3], int)); static void make_mode_str PROTO((aChannel *, long, long, int, @@ -307,22 +307,6 @@ static int del_exbanid(chptr, banid) return -1; } -/* - * find_banid - Find an exact match for a exban - */ -static int find_exbanid(chptr, banid) - aChannel *chptr; - char *banid; -{ - Ban **ban; - - if (!banid) - return -1; - for (ban = &(chptr->exlist); *ban; ban = &((*ban)->next)) - if (!mycmp(banid, (*ban)->banstr)) - return 1; - return 0; -} /* @@ -397,22 +381,6 @@ static int del_banid(chptr, banid) return -1; } -/* - * find_banid - Find an exact match for a ban - */ -static int find_banid(chptr, banid) - aChannel *chptr; - char *banid; -{ - Ban **ban; - - if (!banid) - return -1; - for (ban = &(chptr->banlist); *ban; ban = &((*ban)->next)) - if (!mycmp(banid, (*ban)->banstr)) - return 1; - return 0; -} /* * IsMember - returns 1 if a person is joined @@ -564,7 +532,7 @@ int is_chan_op(cptr, chptr) Link *lp; /* chanop/halfop ? */ if (chptr) - if (lp = find_user_link(chptr->members, cptr)) + if ((lp = find_user_link(chptr->members, cptr))) return ((lp->flags & CHFL_CHANOP)); return 0; @@ -601,7 +569,7 @@ int is_halfop(cptr, chptr) Link *lp; if (chptr) - if (lp = find_user_link(chptr->members, cptr)) + if ((lp = find_user_link(chptr->members, cptr))) if (!is_chan_op(cptr, chptr)) /* excessive but needed */ return (lp->flags & CHFL_HALFOP); @@ -615,7 +583,7 @@ int is_chanowner(cptr, chptr) Link *lp; if (chptr) - if (lp = find_user_link(chptr->members, cptr)) + if ((lp = find_user_link(chptr->members, cptr))) return (lp->flags & CHFL_CHANOWNER); return 0; @@ -628,7 +596,7 @@ int is_chanprot(cptr, chptr) Link *lp; if (chptr) - if (lp = find_user_link(chptr->members, cptr)) + if ((lp = find_user_link(chptr->members, cptr))) return (lp->flags & CHFL_CHANPROT); return 0; @@ -1314,7 +1282,7 @@ void do_mode(chptr, cptr, sptr, parc, parv, sendts, samode) if (*mode_buf == '\0' || (*(mode_buf + 1) == '\0' && (*mode_buf == '+' || *mode_buf == '-'))) { - if (tschange || isbounce) /* relay bounce time changes */ + if (tschange || isbounce) { /* relay bounce time changes */ if (chptr->creationtime) sendto_serv_butone_token(cptr, me.name, MSG_MODE, TOK_MODE, "%s %s+ %lu", @@ -1325,6 +1293,7 @@ void do_mode(chptr, cptr, sptr, parc, parv, sendts, samode) MSG_MODE, TOK_MODE, "%s %s+ ", chptr->chname, isbounce ? "&" : ""); return; /* nothing to send */ + } } /* opermode for twimodesystem --sts */ #ifndef NO_OPEROVERRIDE diff --git a/src/chkconf.c b/src/chkconf.c index 7dc4b8237..576d9b40c 100644 --- a/src/chkconf.c +++ b/src/chkconf.c @@ -33,6 +33,7 @@ #ifdef PCS #include #endif +#include ID_Copyright("(C) 1993 Darren Reed"); ID_Notes("DF version was 1.9 1/30/94"); diff --git a/src/cloak.c b/src/cloak.c index 8a5c08783..a5170129c 100644 --- a/src/cloak.c +++ b/src/cloak.c @@ -36,6 +36,7 @@ static char sccxid[] = "@(#)cloak.c 9.00 7/12/99 UnrealIRCd"; #include "userload.h" #include #include +#include #include "h.h" @@ -210,7 +211,7 @@ char *make_virthost(char *curr, char *new, int mode) char *x; int i; if (curr == NULL) - return; + return (char *)NULL; mask = hidehost(curr, 0); if (mode == 0) diff --git a/src/dynconf.c b/src/dynconf.c index cf86c88b7..3618c87a7 100644 --- a/src/dynconf.c +++ b/src/dynconf.c @@ -400,6 +400,7 @@ int load_conf2(FILE * conf, char *filename, int type) { sendto_realops("Loaded %s ..", filename); } +return 0; } /* Load .network options */ @@ -512,6 +513,7 @@ int load_conf3(FILE * conf, char *filename, int type) { sendto_realops("Loaded %s ..", INCLUDE); } + return 0; } diff --git a/src/hash.c b/src/hash.c index dd8c27b27..5af9ee726 100644 --- a/src/hash.c +++ b/src/hash.c @@ -17,6 +17,7 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ +#include #include #include "numeric.h" #include "struct.h" diff --git a/src/res.c b/src/res.c index a57d17d58..1d6beabcb 100644 --- a/src/res.c +++ b/src/res.c @@ -20,6 +20,7 @@ #endif #include "nameser.h" #include "resolv.h" +#include #ifndef lint static char sccsid[] = "@(#)res.c 2.38 4/13/94 (C) 1992 Darren Reed"; diff --git a/src/s_auth.c b/src/s_auth.c index 1809697b0..7bd114aa3 100644 --- a/src/s_auth.c +++ b/src/s_auth.c @@ -43,6 +43,7 @@ static char sccsid[] = "@(#)s_auth.c 1.18 4/18/94 (C) 1992 Darren Reed"; #include "sock.h" /* If FD_ZERO isn't define up to this point, */ /* define it (BSD4.2 needs this) */ #include "h.h" +#include /* * start_auth diff --git a/src/s_bsd.c b/src/s_bsd.c index b8728180e..bdefec651 100644 --- a/src/s_bsd.c +++ b/src/s_bsd.c @@ -69,6 +69,8 @@ Computing Center and Jarkko Oikarinen"; #endif #include "resolv.h" #include "sock.h" /* If FD_ZERO isn't define up to this point, */ +#include +#include "proto.h" /* define it (BSD4.2 needs this) */ #include "h.h" #ifndef NO_FDLIST diff --git a/src/s_conf.c b/src/s_conf.c index ee70ace32..500e3c2d1 100644 --- a/src/s_conf.c +++ b/src/s_conf.c @@ -53,6 +53,7 @@ Computing Center and Jarkko Oikarinen"; #if defined(PCS) || defined(AIX) || defined(SVR3) #include #endif +#include ID_Notes("O:line flags in here"); #include "h.h" diff --git a/src/s_err.c b/src/s_err.c index 250fada48..78e2419eb 100644 --- a/src/s_err.c +++ b/src/s_err.c @@ -485,7 +485,7 @@ static char *replies[] = { /* 442 ERR_NOTONCHANNEL */ ":%s 442 %s %s :You're not on that channel", /* 443 ERR_USERONCHANNEL */ ":%s 443 %s %s %s :is already on channel", /* 444 ERR_NOLOGIN */ ":%s 444 %s %s :User not logged in", -/* 445 ERR_SUMMONDISABLED */ ":%s 447 %s :SUMMON has been disabled", +/* 445 ERR_SUMMONDISABLED */ ":%s 445 %s :SUMMON has been disabled", /* 446 ERR_USERSDISABLED */ ":%s 446 %s :USERS has been disabled", /* 447 */ NULL, /* 448 */ NULL, diff --git a/src/s_misc.c b/src/s_misc.c index 4c7072a07..5b7a31078 100644 --- a/src/s_misc.c +++ b/src/s_misc.c @@ -53,6 +53,7 @@ Computing Center and Jarkko Oikarinen"; #endif #include "h.h" #include "channel.h" +#include #ifndef NO_FDLIST extern fdlist serv_fdlist; diff --git a/src/s_numeric.c b/src/s_numeric.c index 4933993c3..804a6ba40 100644 --- a/src/s_numeric.c +++ b/src/s_numeric.c @@ -30,6 +30,7 @@ Computing Center and Jarkko Oikarinen"; #include "sys.h" #include "numeric.h" #include "h.h" +#include extern char backupbuf[]; static char buffer[1024]; diff --git a/src/s_serv.c b/src/s_serv.c index b2b8e19c0..b847e848d 100644 --- a/src/s_serv.c +++ b/src/s_serv.c @@ -45,7 +45,7 @@ static char sccsid[] = #endif #include #include "h.h" - +#include static char buf[BUFSIZE]; diff --git a/src/scache.c b/src/scache.c index 3f0fada72..267272e98 100644 --- a/src/scache.c +++ b/src/scache.c @@ -6,6 +6,7 @@ #include "sys.h" #include "numeric.h" #include "h.h" +#include static int hash(char *); /* diff --git a/src/send.c b/src/send.c index bccf5c401..d4a76955a 100644 --- a/src/send.c +++ b/src/send.c @@ -37,7 +37,7 @@ static char sccsid[] = #ifdef _WIN32 #include #endif - +#include void vsendto_one(aClient *to, char *pattern, va_list vl); void sendbufto_one(aClient *to); diff --git a/src/support.c b/src/support.c index 679fbf00c..65c8326b5 100644 --- a/src/support.c +++ b/src/support.c @@ -30,6 +30,7 @@ static char sccsid[] = "@(#)support.c 2.21 4/13/94 1990, 1991 Armin Gruner;\ #ifdef _WIN32 #include #else +#include extern int errno; /* ...seems that errno.h doesn't define this everywhere */ diff --git a/src/webtv.c b/src/webtv.c index 909302bcd..bf42a647a 100644 --- a/src/webtv.c +++ b/src/webtv.c @@ -35,6 +35,7 @@ #endif #include #include "h.h" +#include "proto.h" ID_Copyright("(C) Carsten Munk 2000"); diff --git a/src/whowas.c b/src/whowas.c index 4611ab7ed..883d83c1e 100644 --- a/src/whowas.c +++ b/src/whowas.c @@ -24,6 +24,8 @@ #include "numeric.h" #include "h.h" #include "hash.h" +#include "proto.h" +#include /* externally defined functions */ unsigned int hash_whowas_name(char *); /* defined in hash.c */ @@ -126,7 +128,6 @@ void count_whowas_memory(int *wwu, u_long *wwum) int i; int u = 0; u_long um = 0; - u_long uam = 0; /* count the number of used whowas structs in 'u' */ /* count up the memory used of whowas structs in um */