Various fixups and checks to make scan-build happy

[petitboot] / discover / paths.c

diff --git a/discover/paths.c b/discover/paths.c
index e30f0320c1f19d5e9e6d5b436ae48ee008f794d4..16fdd597444d19856f1aad00cb810aa3ee68657e 100644 (file)
--- a/discover/paths.c
+++ b/discover/paths.c
@@ -158,7 +158,7 @@ static int busybox_progress_cb(void *arg)
        p = procinfo_get_process(procinfo);
        handler = p->stdout_data;
 
-       rc = process_stdout_custom(procinfo, &line);
+       rc = process_process_stdout(procinfo, &line);
 
        if (rc) {
                /* Unregister ourselves from progress tracking */
@@ -450,7 +450,8 @@ static void load_local(struct load_task *task)
                result->status = LOAD_OK;
        }
 
-       task->async_cb(task->result, task->async_data);
+       if (task->async_cb)
+               task->async_cb(task->result, task->async_data);
 }
 
 static void load_url_async_start_pending(struct load_task *task, int flags)