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

4
source/parse.c
View File

@@ -1719,7 +1719,7 @@ static void p_kick(char *from, char **ArgList)
new_free(&chankey);
if (do_hook(KICK_LIST, "%s %s %s %s", who, from, channel, comment?comment:empty_string))
put_it("%s",convert_output_format(fget_string_var(FORMAT_KICK_USER_FSET),"%s %s %s %s %s",update_clock(GET_TIME),from, channel, who, comment));
remove_channel(channel, from_server);
remove_channel(channel);
update_all_status(window ? window : current_window, NULL, 0);
update_input(UPDATE_ALL);
logmsg(LOG_KICK_USER, from, 0, "%s %s %s %s", FromUserHost, who, channel, comment);
@@ -1784,7 +1784,7 @@ static void p_part(char *from, char **ArgList)
put_it("%s",convert_output_format(fget_string_var(FORMAT_LEAVE_FSET), "%s %s %s %s %s", update_clock(GET_TIME), from, FromUserHost, channel, ArgList[1]?ArgList[1]:empty_string));
if (!my_stricmp(from, get_server_nickname(from_server)))
{
remove_channel(channel, from_server);
remove_channel(channel);
remove_from_mode_list(channel, from_server);
remove_from_join_list(channel, from_server);
set_input_prompt(current_window, get_string_var(INPUT_PROMPT_VAR), 0);