Changeset 4c6fd56 in mainline for uspace/app/taskbar/test/wndlist.c

Timestamp:

2023-09-16T19:58:18Z (8 months ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

master, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

7d7f5e3

Parents:

6a0b2cc

git-author:

Jiri Svoboda <jiri@…> (2023-09-16 19:48:07)

git-committer:

Jiri Svoboda <jiri@…> (2023-09-16 19:58:18)

Message:

loc_server_register() should be callable more than once (API only)

Now loc_server_register() returns a pointer to a loc_srv_t object,
that is then passed to loc_service_register() and
loc_service_add_to_cat().

Added loc_server_unregister() that unregisters the server
and frees the loc_srv_t object.

Updated all callers. The implementation, however, is a stub.
It is not actually possible to call loc_server_register() more
than once, yet.

File:

• uspace/app/taskbar/test/wndlist.c (modified) (3 diffs)

uspace/app/taskbar/test/wndlist.c

@@ -139 +139 @@
         ui_fixed_t *fixed = NULL;
         wndlist_t *wndlist;
+        loc_srv_t *srv;
 
         /* Set up a test WM service */
@@ -145 +146 @@
 
         // FIXME This causes this test to be non-reentrant!
-        rc = loc_server_register(test_wndmgt_server);
-        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
-
-        rc = loc_service_register(test_wndmgt_svc, &sid);
+        rc = loc_server_register(test_wndmgt_server, &srv);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+        rc = loc_service_register(srv, test_wndmgt_svc, &sid);
         PCUT_ASSERT_ERRNO_VAL(EOK, rc);
 
@@ -177 +178 @@
         ui_destroy(ui);
 
-        rc = loc_service_unregister(sid);
-        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+        rc = loc_service_unregister(srv, sid);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+        loc_server_unregister(srv);
 }