Changeset 06599a1 in mainline

Timestamp:

2020-03-06T19:13:55Z (4 years ago)

Author:

Matthieu Riolo <matthieu.riolo@…>

Children:

3529f148

Parents:

22d990c

git-author:

Matthieu Riolo <matthieu.riolo@…> (2020-02-05 21:48:41)

git-committer:

Matthieu Riolo <matthieu.riolo@…> (2020-03-06 19:13:55)

Message:

Correcting sysctl list-units

One failure was a cast in lib/sysman/src/ctl.c which wrongly used
an enum like a pointer of the type sysarg_t. This resulted into a
memory allocation failure.

The second bug was in the loop of sysctl. For iterating over all
found units the difference was created of two pointers and then
compared to an unsigned int which was down casted to an int.
Unnecessary complicated and a source for casting problems.
It has been replaced with a simple for-loop and an array access

Location:

uspace

Files:

• app/sysctl/main.c (modified) (1 diff)
• lib/sysman/src/ctl.c (modified) (1 diff)

uspace/app/sysctl/main.c

@@ -76 +76 @@
         }
 
-        for (unit_handle_t *it = units; it - units < (int)unit_cnt; ++it) {
+        for (size_t i = 0; i < unit_cnt; i++) {
+                unit_handle_t handle = units[i];
                 char name[NAME_BUFFER];
                 unit_state_t state;
 
-                rc = sysman_unit_get_name(*it, name, NAME_BUFFER);
+                rc = sysman_unit_get_name(handle, name, NAME_BUFFER);
                 if (rc != EOK)
                         goto fail;
 
-                rc = sysman_unit_get_state(*it, &state);
+                rc = sysman_unit_get_state(handle, &state);
                 if (rc != EOK)
                         goto fail;

uspace/lib/sysman/src/ctl.c

@@ -186 +186 @@
 errno_t sysman_unit_get_state(unit_handle_t handle, unit_state_t *state)
 {
-        async_exch_t *exch = sysman_exchange_begin(SYSMAN_PORT_CTL);
-        errno_t rc = async_req_1_1(exch, SYSMAN_CTL_UNIT_GET_STATE, handle, (sysarg_t *)state);
-        sysman_exchange_end(exch);
+        sysarg_t ret;
+        async_exch_t *exch = sysman_exchange_begin(SYSMAN_PORT_CTL);
+        errno_t rc = async_req_1_1(exch, SYSMAN_CTL_UNIT_GET_STATE, handle, &ret);
+        sysman_exchange_end(exch);
+        *state = (unit_state_t)ret;
 
         return rc;