From 80362e0d9c2dcd9daa639b88a2e41bc76d67f7b3 Mon Sep 17 00:00:00 2001 From: Bram Matthys Date: Thu, 25 Jun 2015 22:38:22 +0200 Subject: [PATCH] Fix compile warnings (and possibly a crash in dcc deny code introduced a week or so ago) --- include/h.h | 48 ++++++++++++++++---------------- src/modules/chanmodes/censor.c | 2 +- src/modules/snomasks/dccreject.c | 2 +- 3 files changed, 26 insertions(+), 26 deletions(-) diff --git a/include/h.h b/include/h.h index 436ede26e..67797299f 100644 --- a/include/h.h +++ b/include/h.h @@ -102,34 +102,34 @@ extern int config_is_blankorempty(ConfigEntry *cep, const char *block); extern MODVAR int config_verbose; extern void config_progress(char *format, ...) __attribute__((format(printf,1,2))); extern void ipport_seperate(char *string, char **ip, char **port); -ConfigItem_class *Find_class(char *name); -ConfigItem_deny_dcc *Find_deny_dcc(char *name); -ConfigItem_oper *Find_oper(char *name); -ConfigItem_operclass *Find_operclass(char *name); -ConfigItem_listen *Find_listen(char *ipmask, int port); -ConfigItem_ulines *Find_uline(char *host); -ConfigItem_except *Find_except(aClient *, char *host, short type); -ConfigItem_tld *Find_tld(aClient *cptr, char *host); -ConfigItem_link *Find_link(char *servername, aClient *acptr); -ConfigItem_ban *Find_ban(aClient *, char *host, short type); -ConfigItem_ban *Find_banEx(aClient *,char *host, short type, short type2); -ConfigItem_vhost *Find_vhost(char *name); -ConfigItem_deny_channel *Find_channel_allowed(aClient *cptr, char *name); -ConfigItem_alias *Find_alias(char *name); -ConfigItem_help *Find_Help(char *command); +extern ConfigItem_class *Find_class(char *name); +extern ConfigItem_deny_dcc *Find_deny_dcc(char *name); +extern ConfigItem_oper *Find_oper(char *name); +extern ConfigItem_operclass *Find_operclass(char *name); +extern ConfigItem_listen *Find_listen(char *ipmask, int port); +extern ConfigItem_ulines *Find_uline(char *host); +extern ConfigItem_except *Find_except(aClient *, char *host, short type); +extern ConfigItem_tld *Find_tld(aClient *cptr, char *host); +extern ConfigItem_link *Find_link(char *servername, aClient *acptr); +extern ConfigItem_ban *Find_ban(aClient *, char *host, short type); +extern ConfigItem_ban *Find_banEx(aClient *,char *host, short type, short type2); +extern ConfigItem_vhost *Find_vhost(char *name); +extern ConfigItem_deny_channel *Find_channel_allowed(aClient *cptr, char *name); +extern ConfigItem_alias *Find_alias(char *name); +extern ConfigItem_help *Find_Help(char *command); -OperPermission OperClass_evaluateACLPath(char* path, aClient *sptr, aClient *victim, aChannel *channel, void* extra); +extern OperPermission OperClass_evaluateACLPath(char *path, aClient *sptr, aClient *victim, aChannel *channel, void *extra); +extern void OperClassValidatorDel(OperClassValidator *validator); -int AllowClient(aClient *cptr, struct hostent *hp, char *sockhost, char *username); -int parse_netmask(const char *text, struct irc_netmask *netmask); -int match_ip(struct IN_ADDR addr, char *uhost, char *mask, struct irc_netmask *netmask); +extern int AllowClient(aClient *cptr, struct hostent *hp, char *sockhost, char *username); +extern int parse_netmask(const char *text, struct irc_netmask *netmask); +extern int match_ip(struct IN_ADDR addr, char *uhost, char *mask, struct irc_netmask *netmask); #ifdef INET6 -int match_ipv6(struct IN_ADDR *addr, struct IN_ADDR *mask, int bits); +extern int match_ipv6(struct IN_ADDR *addr, struct IN_ADDR *mask, int bits); #endif -ConfigItem_ban *Find_ban_ip(aClient *sptr); -void add_ListItem(ListStruct *, ListStruct **); -ListStruct *del_ListItem(ListStruct *, ListStruct **); -/* Remmed out for win32 compatibility.. as stated of 467leaf win32 port.. */ +extern ConfigItem_ban *Find_ban_ip(aClient *sptr); +extern void add_ListItem(ListStruct *, ListStruct **); +extern ListStruct *del_ListItem(ListStruct *, ListStruct **); extern aClient *find_match_server(char *mask); extern MODVAR LoopStruct loop; extern int del_banid(aChannel *chptr, char *banid); diff --git a/src/modules/chanmodes/censor.c b/src/modules/chanmodes/censor.c index 5f9577c98..bc914964c 100644 --- a/src/modules/chanmodes/censor.c +++ b/src/modules/chanmodes/censor.c @@ -133,7 +133,7 @@ DLLFUNC int censor_config_test(ConfigFile *cf, ConfigEntry *ce, int type, int *e { config_error("%s:%i: badword quit has been removed. We just use the bad words from " "badword channel { } instead.", - cep->ce_fileptr->cf_filename, cep->ce_varlinenum); + ce->ce_fileptr->cf_filename, ce->ce_varlinenum); return 0; /* pretend unhandled.. ok not just pretend.. ;) */ } diff --git a/src/modules/snomasks/dccreject.c b/src/modules/snomasks/dccreject.c index 848e21a64..fc40b8121 100644 --- a/src/modules/snomasks/dccreject.c +++ b/src/modules/snomasks/dccreject.c @@ -64,7 +64,7 @@ int dccreject_dcc_denied(aClient *sptr, aClient *target, char *realfile, char *d { sendto_snomask_global(SNO_DCCREJECT, "%s tried to send forbidden file %s (%s) to %s (is blocked now)", - sptr->name, displayfile, dccdeny->reason, target); + sptr->name, displayfile, dccdeny->reason, target->name); return 0; }