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

Simplifications to cset_variable()

Browse Source 
Remove some unnecessary variables and reorder the code slightly. This should have no functional change.
This commit is contained in:
Kevin Easton
2019-07-13 01:05:31 +10:00
parent e347375cb3
commit 43ace65cb3
1 changed files with 33 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
source/cset.c
View File

@@ -568,49 +568,45 @@ int var_index, cnt = 0;
BUILT_IN_COMMAND(cset_variable) BUILT_IN_COMMAND(cset_variable)
{ {
char *var, *channel = NULL; char *var, *channel = NULL;
int no_args = 1, cnt, var_index, hook = 1; int cnt, var_index;
if (from_server != -1 && current_window->server != -1)
{
if (args && *args && (is_channel(args) || *args == '*')) if (args && *args && (is_channel(args) || *args == '*'))
channel = next_arg(args, &args); channel = next_arg(args, &args);
else else
channel = get_current_channel_by_refnum(0); channel = get_current_channel_by_refnum(0);
}
else if (args && *args && (is_channel(args) || *args == '*'))
channel = next_arg(args, &args);
if (!channel) if (!channel)
return; return;
if ((var = next_arg(args, &args)) != NULL) var = next_arg(args, &args);
if (!var)
{ {
cset_variable_noargs(channel);
return;
}
if (*var == '-') if (*var == '-')
{ {
var++; var++;
args = NULL; args = NULL;
} }
var_index = find_cset_variable(cset_array, var, &cnt); var_index = find_cset_variable(cset_array, var, &cnt);
if (hook)
{
switch (cnt) switch (cnt)
{ {
case 0: case 0:
say("No such variable \"%s\"", var); say("No such variable \"%s\"", var);
return; break;
case 1: case 1:
cset_variable_case1(channel, var_index, args); cset_variable_case1(channel, var_index, args);
return; break;
default: default:
say("%s is ambiguous", var); say("%s is ambiguous", var);
cset_variable_casedef(channel, cnt, var_index, args); cset_variable_casedef(channel, cnt, var_index, args);
return; break;
} }
}
}
if (no_args)
cset_variable_noargs(channel);
} }
CSetList *create_csets_for_channel(char *channel) CSetList *create_csets_for_channel(char *channel)