Changeset f0cc1c64 in mainline for uspace/srv/system/system.c

Timestamp:

2025-06-20T19:26:13Z (9 days ago)

Author:

Miroslav Cimerman <mc@…>

Children:

817cb83

Parents:

f0360ec (diff), 5caad1d (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.

Message:

Merge upstream into helenraid

File:

• uspace/srv/system/system.c (modified) (3 diffs)

uspace/srv/system/system.c

@@ -573 +573 @@
 static errno_t system_srv_init(sys_srv_t *syssrv)
 {
-        port_id_t port;
+        port_id_t port = 0;
         loc_srv_t *srv = NULL;
         service_id_t sid = 0;
@@ -595 +595 @@
         }
 
-        rc = loc_service_register(srv, SYSTEM_DEFAULT, &sid);
+        rc = loc_service_register(srv, SYSTEM_DEFAULT, port, &sid);
         if (rc != EOK) {
                 log_msg(LOG_DEFAULT, LVL_ERROR,
@@ -609 +609 @@
         if (srv != NULL)
                 loc_server_unregister(srv);
-        // XXX destroy port
+        if (port != 0)
+                async_port_destroy(port);
         return rc;
 }