Changeset 25697163 in mainline for uspace/srv/sysman/job_closure.c


Ignore:
Timestamp:
2019-10-06T19:47:15Z (5 years ago)
Author:
Matthieu Riolo <matthieu.riolo@…>
Children:
9559cf8
Parents:
102f641
git-author:
Matthieu Riolo <matthieu.riolo@…> (2019-09-06 17:58:36)
git-committer:
Matthieu Riolo <matthieu.riolo@…> (2019-10-06 19:47:15)
Message:

Replacing int with errno_t

The merged code from system-daemon still used the type int
for indicating an error instead of using errno_t. This
commit corrects this mistake

File:
1 edited

Legend:

Unmodified
Added
Removed
  • uspace/srv/sysman/job_closure.c

    r102f641 r25697163  
    5151         * return result of visit (error stops further traversal)
    5252         */
    53         int (*visit)(unit_t *, unit_edge_t *, bfs_ops_t *, void *);
     53        errno_t (*visit)(unit_t *, unit_edge_t *, bfs_ops_t *, void *);
    5454
    5555        /** Clean units remaining in BFS queue after error */
     
    6161 */
    6262
    63 static int job_add_blocked_job(job_t *blocking_job, job_t *blocked_job)
     63static errno_t job_add_blocked_job(job_t *blocking_job, job_t *blocked_job)
    6464{
    6565        assert(blocking_job->blocked_jobs.size ==
    6666            blocking_job->blocked_jobs_count);
    6767
    68         int rc = dyn_array_append(&blocking_job->blocked_jobs, job_t *,
     68        errno_t rc = dyn_array_append(&blocking_job->blocked_jobs, job_t *,
    6969            blocked_job);
    7070        if (rc != EOK) {
     
    8686 * @return EOK on success
    8787 */
    88 static int visit_propagate_job(unit_t *u, unit_edge_t *e, bfs_ops_t *ops,
     88static errno_t visit_propagate_job(unit_t *u, unit_edge_t *e, bfs_ops_t *ops,
    8989    void *arg)
    9090{
    91         int rc = EOK;
     91        errno_t rc = EOK;
    9292        job_t *created_job = NULL;
    9393        job_closure_t *closure = arg;
     
    138138}
    139139
    140 static int visit_isolate(unit_t *u, unit_edge_t *e, bfs_ops_t *ops, void *arg)
    141 {
    142         int rc = EOK;
     140static errno_t visit_isolate(unit_t *u, unit_edge_t *e, bfs_ops_t *ops, void *arg)
     141{
     142        errno_t rc = EOK;
    143143        job_t *created_job = NULL;
    144144        job_closure_t *closure = arg;
     
    187187}
    188188
    189 static int bfs_traverse_component_internal(unit_t *origin, bfs_ops_t *ops,
     189static errno_t bfs_traverse_component_internal(unit_t *origin, bfs_ops_t *ops,
    190190    void *arg)
    191191{
    192         int rc;
     192        errno_t rc;
    193193        list_t units_fifo;
    194194        list_initialize(&units_fifo);
     
    247247}
    248248
    249 static int bfs_traverse_component(unit_t *origin, bfs_ops_t *ops, void *arg)
     249static errno_t bfs_traverse_component(unit_t *origin, bfs_ops_t *ops, void *arg)
    250250{
    251251        /* Check invariant */
     
    253253                assert(u->bfs_tag == false);
    254254        }
    255         int rc = bfs_traverse_component_internal(origin, ops, arg);
     255        errno_t rc = bfs_traverse_component_internal(origin, ops, arg);
    256256
    257257        /* Clean after ourselves (BFS tag jobs) */
     
    262262}
    263263
    264 static int bfs_traverse_all(bfs_ops_t *ops, void *arg)
     264static errno_t bfs_traverse_all(bfs_ops_t *ops, void *arg)
    265265{
    266266        /* Check invariant */
     
    268268                assert(u->bfs_tag == false);
    269269        }
    270         int rc = EOK;
     270        errno_t rc = EOK;
    271271
    272272        repo_foreach(origin) {
     
    299299 * @return EOK on success otherwise propagated error
    300300 */
    301 int job_create_closure(job_t *main_job, job_closure_t *job_closure, int flags)
     301errno_t job_create_closure(job_t *main_job, job_closure_t *job_closure, int flags)
    302302{
    303303        sysman_log(LVL_DEBUG2, "%s(%s)", __func__, unit_name(main_job->unit));
     
    308308        }
    309309
    310         int rc = dyn_array_append(job_closure, job_t *, main_job);
     310        errno_t rc = dyn_array_append(job_closure, job_t *, main_job);
    311311        if (rc != EOK) {
    312312                return rc;
Note: See TracChangeset for help on using the changeset viewer.