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

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:

• uspace/srv/sysman/job_queue.c (modified) (4 diffs)

uspace/srv/sysman/job_queue.c

@@ -103 +103 @@
  * @return error code on fail
  */
-static int job_pre_merge(job_t *trunk, job_t *other)
+static errno_t job_pre_merge(job_t *trunk, job_t *other)
 {
         assert(trunk->unit == other->unit);
@@ -110 +110 @@
         assert(other->merged_into == NULL);
 
-        int rc = dyn_array_concat(&trunk->blocked_jobs, &other->blocked_jobs);
+        errno_t rc = dyn_array_concat(&trunk->blocked_jobs, &other->blocked_jobs);
         if (rc != EOK) {
                 return rc;
@@ -134 +134 @@
          */
         size_t observers_refs = sysman_observers_count(other);
-        int rc = sysman_move_observers(other, trunk);
+        errno_t rc = sysman_move_observers(other, trunk);
         assert(rc == EOK);
 
@@ -166 +166 @@
  * @return EBUSY when any job in closure is conflicting
  */
-int job_queue_add_closure(job_closure_t *closure)
+errno_t job_queue_add_closure(job_closure_t *closure)
 {
         bool has_error = false;
-        int rc = EOK;
+        errno_t rc = EOK;
 
         /* Check consistency with existing jobs. */