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

command: moved command_process_list() to client.c

This commit is contained in:
Max Kellermann 2009-07-29 08:00:01 +02:00
parent 7f865f722c
commit 6f060081be
3 changed files with 31 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/client_process.c
View File

@ -25,6 +25,28 @@
#define CLIENT_LIST_OK_MODE_BEGIN "command_list_ok_begin" #define CLIENT_LIST_OK_MODE_BEGIN "command_list_ok_begin"
#define CLIENT_LIST_MODE_END "command_list_end" #define CLIENT_LIST_MODE_END "command_list_end"
static enum command_return
client_process_command_list(struct client *client, bool list_ok, GSList *list)
{
enum command_return ret = COMMAND_RETURN_OK;
unsigned num = 0;
for (GSList *cur = list; cur != NULL; cur = g_slist_next(cur)) {
char *cmd = cur->data;
g_debug("command_process_list: process command \"%s\"",
cmd);
ret = command_process(client, num++, cmd);
g_debug("command_process_list: command returned %i", ret);
if (ret != COMMAND_RETURN_OK || client_is_expired(client))
break;
else if (list_ok)
client_puts(client, "list_OK\n");
}
return ret;
}
enum command_return enum command_return
client_process_line(struct client *client, char *line) client_process_line(struct client *client, char *line)
{ {
@ -61,9 +83,9 @@ client_process_line(struct client *client, char *line)
to restore the correct order */ to restore the correct order */
client->cmd_list = g_slist_reverse(client->cmd_list); client->cmd_list = g_slist_reverse(client->cmd_list);
ret = command_process_list(client, ret = client_process_command_list(client,
client->cmd_list_OK, client->cmd_list_OK,
client->cmd_list); client->cmd_list);
g_debug("[%u] process command " g_debug("[%u] process command "
"list returned %i", client->num, ret); "list returned %i", client->num, ret);
@ -104,7 +126,7 @@ client_process_line(struct client *client, char *line)
} else { } else {
g_debug("[%u] process command \"%s\"", g_debug("[%u] process command \"%s\"",
client->num, line); client->num, line);
ret = command_process(client, line); ret = command_process(client, 0, line);
g_debug("[%u] command returned %i", g_debug("[%u] command returned %i",
client->num, ret); client->num, ret);

31
src/command.c
View File

@ -1878,7 +1878,7 @@ command_checked_lookup(struct client *client, unsigned permission,
} }
enum command_return enum command_return
command_process(struct client *client, char *line) command_process(struct client *client, unsigned num, char *line)
{ {
GError *error = NULL; GError *error = NULL;
int argc; int argc;
@ -1886,6 +1886,8 @@ command_process(struct client *client, char *line)
const struct command *cmd; const struct command *cmd;
enum command_return ret = COMMAND_RETURN_ERROR; enum command_return ret = COMMAND_RETURN_ERROR;
command_list_num = num;
/* get the command name (first word on the line) */ /* get the command name (first word on the line) */
argv[0] = tokenizer_next_word(&line, &error); argv[0] = tokenizer_next_word(&line, &error);
@ -1940,32 +1942,7 @@ command_process(struct client *client, char *line)
ret = cmd->handler(client, argc, argv); ret = cmd->handler(client, argc, argv);
current_command = NULL; current_command = NULL;
command_list_num = 0;
return ret; return ret;
} }
enum command_return
command_process_list(struct client *client,
bool list_ok, GSList *list)
{
enum command_return ret = COMMAND_RETURN_OK;
command_list_num = 0;
for (GSList *cur = list; cur != NULL; cur = g_slist_next(cur)) {
char *cmd = cur->data;
g_debug("command_process_list: process command \"%s\"",
cmd);
ret = command_process(client, cmd);
g_debug("command_process_list: command returned %i", ret);
if (ret != COMMAND_RETURN_OK || client_is_expired(client))
break;
else if (list_ok)
client_puts(client, "list_OK\n");
command_list_num++;
}
command_list_num = 0;
return ret;
}

6
src/command.h
View File

@ -39,11 +39,7 @@ void command_init(void);
void command_finish(void); void command_finish(void);
enum command_return enum command_return
command_process_list(struct client *client, command_process(struct client *client, unsigned num, char *line);
bool list_ok, GSList *list);
enum command_return
command_process(struct client *client, char *commandString);
void command_success(struct client *client); void command_success(struct client *client);