Changes in uspace/srv/hid/display/main.c [4c6fd56:d8503fd] in mainline

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;
 
@@ -173 +171 @@
                 goto error;
 
-        rc = loc_server_register(NAME, &srv);
+        rc = loc_server_register(NAME);
         if (rc != EOK) {
                 log_msg(LOG_DEFAULT, LVL_ERROR, "Failed registering server: %s.", str_error(rc));
@@ -180 +178 @@
         }
 
-        rc = loc_service_register(srv, SERVICE_NAME_DISPLAY, &sid);
+        service_id_t sid;
+        rc = loc_service_register(SERVICE_NAME_DISPLAY, &sid);
         if (rc != EOK) {
                 log_msg(LOG_DEFAULT, LVL_ERROR, "Failed registering service: %s.", str_error(rc));
@@ -190 +189 @@
         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