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

Simplifications in window_query()

Browse Source 
Should be no user-visible changes.
This commit is contained in:
Kevin Easton
2017-11-09 23:32:56 +11:00
parent 50999b3d5b
commit f81126186c
1 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
source/window.c
View File

@@ -3694,11 +3694,6 @@ Window *window_query (Window *window, char **args, char *usage)
/* /*
* Nuke the old query list * Nuke the old query list
*/ */
if (*args && !my_strnicmp(*args, "-cmd", 4))
{
cmd = next_arg(*args, args);
cmd = next_arg(*args, args);
}
if ((nick = window->query_nick)) if ((nick = window->query_nick))
{ {
say("Ending conversation with %s", current_window->query_nick); say("Ending conversation with %s", current_window->query_nick);
@@ -3721,10 +3716,18 @@ Window *window_query (Window *window, char **args, char *usage)
new_free(&window->query_cmd); new_free(&window->query_cmd);
} }
nick = next_arg(*args, args);
if (nick && !my_strnicmp(nick, "-cmd", 4))
{
cmd = next_arg(*args, args);
nick = next_arg(*args, args);
}
if (cmd) if (cmd)
malloc_strcpy(&window->query_cmd, cmd); malloc_strcpy(&window->query_cmd, cmd);
if ((nick = next_arg(*args, args))) if (nick)
{ {
if (args && *args) if (args && *args)
@@ -3753,8 +3756,6 @@ Window *window_query (Window *window, char **args, char *usage)
if (!nick) if (!nick)
return window; return window;
/* /*
* Create the new query list * Create the new query list
*/ */
@@ -3763,10 +3764,10 @@ Window *window_query (Window *window, char **args, char *usage)
malloc_strcpy(&window->query_host, host); malloc_strcpy(&window->query_host, host);
window->update |= UPDATE_STATUS; window->update |= UPDATE_STATUS;
ptr = nick;
while ((ptr = next_in_comma_list(nick, &nick))) while ((ptr = next_in_comma_list(nick, &nick)))
{ {
if (!ptr || !*ptr) if (!*ptr)
break; break;
tmp = (NickList *) new_malloc(sizeof(NickList)); tmp = (NickList *) new_malloc(sizeof(NickList));
tmp->nick = m_strdup(ptr); tmp->nick = m_strdup(ptr);