philippelh/bitchx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Cleanup remove_channel()

Browse Source 
remove_channel() is only called in direct response to a message from a server,
so it always acts on from_server - remove the unnecessary server argument.

The channel argument is always non-NULL - remove the dead code that removed all
channels if a NULL channel was passed.
This commit is contained in:
Kevin Easton
2017-04-16 16:19:55 +10:00
parent 53f3a34ca5
commit 1ccd082cd2
5 changed files with 23 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/modval.h
View File

@@ -427,7 +427,7 @@ extern Function_ptr *global;
#define get_channel_bans (*(char *(*)(char *, int , int ))global[GET_CHANNEL_BANS])
#define get_channel_mode (*(char *(*)(char *, int ))global[GET_CHANNEL_MODE])
#define clear_bans (*(void (*)(ChannelList *))global[CLEAR_BANS])
#define remove_channel (*(void (*)(char *, int ))global[REMOVE_CHANNEL])
#define remove_channel (*(void (*)(const char *))global[REMOVE_CHANNEL])
#define remove_from_channel (*(void (*)(char *, char *, int , int , char *))global[REMOVE_FROM_CHANNEL])
#define rename_nick (*(void (*)(char *, char *, int ))global[RENAME_NICK])
#define get_channel_oper (*(int (*)(char *, int ))global[GET_CHANNEL_OPER])

2
include/names.h
View File

@@ -61,7 +61,7 @@ void set_channel_mode (char *, int, char *);
#endif /* INCLUDE_UNUSED_FUNCTIONS */
ChannelList * BX_add_channel (char *, int, int);
ChannelList * BX_add_to_channel (char *, char *, int, int, int, char *, char *, char *, int, int);
void BX_remove_channel (char *, int);
void BX_remove_channel (const char *);
void BX_remove_from_channel (char *, char *, int, int, char *);
int BX_is_on_channel (char *, int, char *);
void list_channels (void);