MyFavMirrors/owntone-server
1
0
Fork 0
mirror of https://github.com/owntone/owntone-server.git synced 2025-01-15 00:35:03 -05:00
Code Issues Packages Projects Releases Wiki Activity

[commands] Coverity fixups

Browse Source
This commit is contained in:
ejurgensen 2022-01-20 00:12:01 +01:00
parent e321c54655
commit b059d73211
1 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/commands.c
View File

@ -88,22 +88,21 @@ command_cb_sync(struct commands_base *cmdbase, struct command *cmd)
// Command execution is waiting for pending events before returning to the caller // Command execution is waiting for pending events before returning to the caller
cmdbase->current_cmd = cmd; cmdbase->current_cmd = cmd;
cmd->pending = cmd->ret; cmd->pending = cmd->ret;
return;
} }
else
{
// Command execution finished, execute the bottom half function
if (cmd->ret == 0 && cmd->func_bh)
cmd->func_bh(cmd->arg, &cmd->ret);
event_add(cmdbase->command_event, NULL); // Command execution finished, execute the bottom half function
if (cmd->ret == 0 && cmd->func_bh)
cmd->func_bh(cmd->arg, &cmd->ret);
// Signal the calling thread that the command execution finished event_add(cmdbase->command_event, NULL);
CHECK_ERR(L_MAIN, pthread_cond_signal(&cmd->cond));
CHECK_ERR(L_MAIN, pthread_mutex_unlock(&cmd->lck));
// Note if cmd->func was cmdloop_exit then cmdbase may be invalid now, // Signal the calling thread that the command execution finished
// because commands_base_destroy() may have freed it CHECK_ERR(L_MAIN, pthread_cond_signal(&cmd->cond));
} CHECK_ERR(L_MAIN, pthread_mutex_unlock(&cmd->lck));
// Note if cmd->func was cmdloop_exit then cmdbase may be invalid now,
// because commands_base_destroy() may have freed it
} }
/* /*
@ -357,7 +356,7 @@ commands_exec_async(struct commands_base *cmdbase, command_function func, void *
struct command *cmd; struct command *cmd;
int ret; int ret;
cmd = calloc(1, sizeof(struct command)); CHECK_NULL(L_MAIN, cmd = calloc(1, sizeof(struct command)));
cmd->func = func; cmd->func = func;
cmd->func_bh = NULL; cmd->func_bh = NULL;
cmd->arg = arg; cmd->arg = arg;