Changeset 4c6fd56 in mainline for uspace/app/terminal/terminal.c

Timestamp:

2023-09-16T19:58:18Z (9 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/terminal/terminal.c (modified) (3 diffs)

uspace/app/terminal/terminal.c

@@ -1022 +1022 @@
         term->srvs.sarg = term;
 
-        rc = loc_server_register(NAME);
+        rc = loc_server_register(NAME, &term->srv);
         if (rc != EOK) {
                 printf("Error registering server.\n");
@@ -1033 +1033 @@
             task_get_id());
 
-        rc = loc_service_register(vc, &term->dsid);
+        rc = loc_service_register(term->srv, vc, &term->dsid);
         if (rc != EOK) {
                 printf("Error registering service.\n");
@@ -1063 +1063 @@
         return EOK;
 error:
+        if (term->dsid != 0)
+                loc_service_unregister(term->srv, term->dsid);
+        if (term->srv != NULL)
+                loc_server_unregister(term->srv);
         if (term->window != NULL)
                 ui_window_destroy(term->window);