oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

AllCommands: make variables more local

Browse Source
This commit is contained in:
Max Kellermann 2014-12-06 00:10:34 +01:00
parent bd49e8e76f
commit 1a8c3271da
1 changed files with 13 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/command/AllCommands.cxx
View File

@ -229,10 +229,9 @@ handle_commands(Client &client,
gcc_unused unsigned argc, gcc_unused char *argv[]) gcc_unused unsigned argc, gcc_unused char *argv[])
{ {
const unsigned permission = client.GetPermission(); const unsigned permission = client.GetPermission();
const struct command *cmd;
for (unsigned i = 0; i < num_commands; ++i) { for (unsigned i = 0; i < num_commands; ++i) {
cmd = &commands[i]; const struct command *cmd = &commands[i];
if (cmd->permission == (permission & cmd->permission) && if (cmd->permission == (permission & cmd->permission) &&
command_available(client.partition, cmd)) command_available(client.partition, cmd))
@ -247,10 +246,9 @@ handle_not_commands(Client &client,
gcc_unused unsigned argc, gcc_unused char *argv[]) gcc_unused unsigned argc, gcc_unused char *argv[])
{ {
const unsigned permission = client.GetPermission(); const unsigned permission = client.GetPermission();
const struct command *cmd;
for (unsigned i = 0; i < num_commands; ++i) { for (unsigned i = 0; i < num_commands; ++i) {
cmd = &commands[i]; const struct command *cmd = &commands[i];
if (cmd->permission != (permission & cmd->permission)) if (cmd->permission != (permission & cmd->permission))
client_printf(client, "command: %s\n", cmd->cmd); client_printf(client, "command: %s\n", cmd->cmd);
@ -276,13 +274,12 @@ static const struct command *
command_lookup(const char *name) command_lookup(const char *name)
{ {
unsigned a = 0, b = num_commands, i; unsigned a = 0, b = num_commands, i;
int cmp;
/* binary search */ /* binary search */
do { do {
i = (a + b) / 2; i = (a + b) / 2;
cmp = strcmp(name, commands[i].cmd); const auto cmp = strcmp(name, commands[i].cmd);
if (cmp == 0) if (cmp == 0)
return &commands[i]; return &commands[i];
else if (cmp < 0) else if (cmp < 0)
@ -332,14 +329,12 @@ static const struct command *
command_checked_lookup(Client &client, unsigned permission, command_checked_lookup(Client &client, unsigned permission,
unsigned argc, char *argv[]) unsigned argc, char *argv[])
{ {
const struct command *cmd;
current_command = ""; current_command = "";
if (argc == 0) if (argc == 0)
return nullptr; return nullptr;
cmd = command_lookup(argv[0]); const struct command *cmd = command_lookup(argv[0]);
if (cmd == nullptr) { if (cmd == nullptr) {
command_error(client, ACK_ERROR_UNKNOWN, command_error(client, ACK_ERROR_UNKNOWN,
"unknown command \"%s\"", argv[0]); "unknown command \"%s\"", argv[0]);
@ -358,15 +353,14 @@ CommandResult
command_process(Client &client, unsigned num, char *line) command_process(Client &client, unsigned num, char *line)
{ {
Error error; Error error;
char *argv[COMMAND_ARGV_MAX] = { nullptr };
const struct command *cmd;
CommandResult ret = CommandResult::ERROR;
command_list_num = num; command_list_num = num;
/* get the command name (first word on the line) */ /* get the command name (first word on the line) */
Tokenizer tokenizer(line); Tokenizer tokenizer(line);
char *argv[COMMAND_ARGV_MAX] = { nullptr };
argv[0] = tokenizer.NextWord(error); argv[0] = tokenizer.NextWord(error);
if (argv[0] == nullptr) { if (argv[0] == nullptr) {
current_command = ""; current_command = "";
@ -412,10 +406,13 @@ command_process(Client &client, unsigned num, char *line)
/* look up and invoke the command handler */ /* look up and invoke the command handler */
cmd = command_checked_lookup(client, client.GetPermission(), const struct command *cmd =
command_checked_lookup(client, client.GetPermission(),
argc, argv); argc, argv);
if (cmd)
ret = cmd->handler(client, argc, argv); CommandResult ret = cmd
? cmd->handler(client, argc, argv)
: CommandResult::ERROR;
current_command = nullptr; current_command = nullptr;
command_list_num = 0; command_list_num = 0;