Changeset 25697163 in mainline for uspace/srv/sysman/test

Timestamp:

2019-10-06T19:47:15Z (6 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

Location:

uspace/srv/sysman/test

Files:

• job_closure.c (modified) (5 diffs)
• job_queue.c (modified) (4 diffs)
• mock_unit.c (modified) (3 diffs)
• mock_unit.h (modified) (1 diff)

uspace/srv/sysman/test/job_closure.c

@@ -114 +114 @@
 
         dyn_array_initialize(&exp_closure, job_t *);
-        int rc = dyn_array_reserve(&exp_closure, MAX_TYPES * MAX_UNITS);
+        errno_t rc = dyn_array_reserve(&exp_closure, MAX_TYPES * MAX_UNITS);
         assert(rc == EOK);
 
@@ -153 +153 @@
         assert(main_job);
 
-        int rc = job_create_closure(main_job, &act_closure, 0);
+        errno_t rc = job_create_closure(main_job, &act_closure, 0);
         PCUT_ASSERT_INT_EQUALS(EOK, rc);
 
@@ -185 +185 @@
         assert(main_job);
 
-        int rc = job_create_closure(main_job, &act_closure, 0);
+        errno_t rc = job_create_closure(main_job, &act_closure, 0);
         PCUT_ASSERT_INT_EQUALS(EOK, rc);
 
@@ -219 +219 @@
         assert(main_job);
 
-        int rc = job_create_closure(main_job, &act_closure, 0);
+        errno_t rc = job_create_closure(main_job, &act_closure, 0);
         PCUT_ASSERT_INT_EQUALS(EOK, rc);
 
@@ -266 +266 @@
         assert(main_job);
 
-        int rc = job_create_closure(main_job, &act_closure, CLOSURE_ISOLATE);
+        errno_t rc = job_create_closure(main_job, &act_closure, CLOSURE_ISOLATE);
         PCUT_ASSERT_INT_EQUALS(EOK, rc);
 

uspace/srv/sysman/test/job_queue.c

@@ -86 +86 @@
         job_t *job = NULL;
 
-        int rc = sysman_run_job(u, STATE_STARTED, 0, &job_finished_cb,
+        errno_t rc = sysman_run_job(u, STATE_STARTED, 0, &job_finished_cb,
             &job);
         PCUT_ASSERT_INT_EQUALS(EOK, rc);
@@ -106 +106 @@
         job_t *job = NULL;
 
-        int rc = sysman_run_job(u, STATE_STARTED, 0, &job_finished_cb, &job);
+        errno_t rc = sysman_run_job(u, STATE_STARTED, 0, &job_finished_cb, &job);
         PCUT_ASSERT_INT_EQUALS(EOK, rc);
 
@@ -147 +147 @@
         /* Run test */
         job_t *job = NULL;
-        int rc = sysman_run_job(s1, STATE_STARTED, 0, &job_finished_cb, &job);
+        errno_t rc = sysman_run_job(s1, STATE_STARTED, 0, &job_finished_cb, &job);
         PCUT_ASSERT_INT_EQUALS(EOK, rc);
 
@@ -169 +169 @@
         /* Create and start first job */
         job_t *j0 = NULL;
-        int rc = sysman_run_job(s0, STATE_STARTED, 0, &job_finished_cb, &j0);
+        errno_t rc = sysman_run_job(s0, STATE_STARTED, 0, &job_finished_cb, &j0);
         PCUT_ASSERT_INT_EQUALS(EOK, rc);
 

uspace/srv/sysman/test/mock_unit.c

@@ -78 +78 @@
 void mock_add_edge(unit_t *input, unit_t *output)
 {
-        int rc = edge_connect(input, output);
+        errno_t rc = edge_connect(input, output);
         assert(rc == EOK);
 
@@ -87 +87 @@
 }
 
-int mock_unit_vmt_start_sync(unit_t *unit)
+errno_t mock_unit_vmt_start_sync(unit_t *unit)
 {
         unit->state = STATE_STARTED;
@@ -93 +93 @@
 }
 
-int mock_unit_vmt_start_async(unit_t *unit)
+errno_t mock_unit_vmt_start_async(unit_t *unit)
 {
         unit->state = STATE_STARTING;

uspace/srv/sysman/test/mock_unit.h

@@ -48 +48 @@
 extern void mock_add_edge(unit_t *, unit_t *);
 
-extern int mock_unit_vmt_start_sync(unit_t *);
-extern int mock_unit_vmt_start_async(unit_t *);
+extern errno_t mock_unit_vmt_start_sync(unit_t *);
+extern errno_t mock_unit_vmt_start_async(unit_t *);
 extern void mock_unit_vmt_exposee_created(unit_t *);