Changeset dc5c303 in mainline for uspace/app/terminal/terminal.c

Timestamp:

2023-12-28T13:59:23Z (2 years ago)

Author:

GitHub <noreply@…>

Children:

6b66de6b

Parents:

42c2e65 (diff), f87ff8e (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

boba-buba <120932204+boba-buba@…> (2023-12-28 13:59:23)

git-committer:

GitHub <noreply@…> (2023-12-28 13:59:23)

Message:

Merge branch 'master' into topic/packet-capture

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);