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

[pipe] Removing CHECK_NULL with malloc, scan-build not happy about it

Browse Source
This commit is contained in:
ejurgensen 2017-02-11 00:28:29 +01:00
parent f0c9843194
commit 98348b8fe9
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/inputs/pipe.c
View File

@ -711,21 +711,22 @@ static void
pipe_listener_cb(enum listener_event_type type) pipe_listener_cb(enum listener_event_type type)
{ {
union pipe_arg *cmdarg; union pipe_arg *cmdarg;
struct pipe *pipelist;
pipelist = pipelist_create(); cmdarg = malloc(sizeof(union pipe_arg));
if (!pipelist) if (!cmdarg)
return;
cmdarg->pipelist = pipelist_create();
if (!cmdarg->pipelist)
{ {
pipe_thread_stop(); pipe_thread_stop();
free(cmdarg);
return; return;
} }
if (!tid_pipe) if (!tid_pipe)
pipe_thread_start(); pipe_thread_start();
CHECK_NULL(L_PLAYER, cmdarg = malloc(sizeof(union pipe_arg)));
cmdarg->pipelist = pipelist;
commands_exec_async(cmdbase, pipe_watch_update, cmdarg); commands_exec_async(cmdbase, pipe_watch_update, cmdarg);
} }
@ -815,9 +816,8 @@ stop(struct player_source *ps)
// Reset the pipe and start watching it again for new data. Must be async or // Reset the pipe and start watching it again for new data. Must be async or
// we will deadlock from the stop in pipe_read_cb(). // we will deadlock from the stop in pipe_read_cb().
if (pipe_autostart) if (pipe_autostart && (cmdarg = malloc(sizeof(union pipe_arg))))
{ {
CHECK_NULL(L_PLAYER, cmdarg = malloc(sizeof(union pipe_arg)));
cmdarg->id = pipe->id; cmdarg->id = pipe->id;
commands_exec_async(cmdbase, pipe_watch_reset, cmdarg); commands_exec_async(cmdbase, pipe_watch_reset, cmdarg);
} }