Changeset 1c6c3e1d in mainline for uspace/srv/hid/display/main.c

Timestamp:

2023-10-22T17:55:33Z (20 months ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Branches:

ticket/834-toolchain-update

Children:

350ec74

Parents:

315d487 (diff), 133461c (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 branch 'master' into ticket

File:

• uspace/srv/hid/display/main.c (modified) (4 diffs)

uspace/srv/hid/display/main.c

@@ -127 +127 @@
         port_id_t wm_port;
         port_id_t dc_port;
+        loc_srv_t *srv = NULL;
+        service_id_t sid = 0;
         errno_t rc;
 
@@ -171 +173 @@
                 goto error;
 
-        rc = loc_server_register(NAME);
+        rc = loc_server_register(NAME, &srv);
         if (rc != EOK) {
                 log_msg(LOG_DEFAULT, LVL_ERROR, "Failed registering server: %s.", str_error(rc));
@@ -178 +180 @@
         }
 
-        service_id_t sid;
-        rc = loc_service_register(SERVICE_NAME_DISPLAY, &sid);
+        rc = loc_service_register(srv, SERVICE_NAME_DISPLAY, &sid);
         if (rc != EOK) {
                 log_msg(LOG_DEFAULT, LVL_ERROR, "Failed registering service: %s.", str_error(rc));
@@ -189 +190 @@
         return EOK;
 error:
+        if (sid != 0)
+                loc_service_unregister(srv, sid);
+        if (srv != NULL)
+                loc_server_unregister(srv);
         // XXX destroy disp_port
         // XXX destroy gc_port