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

Timestamp:

2023-10-22T17:55:33Z (14 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/output/output.c (modified) (4 diffs)

uspace/srv/hid/output/output.c

@@ -1 +1 @@
 /*
+ * Copyright (c) 2023 Jiri Svoboda
  * Copyright (c) 2011 Martin Decky
  * All rights reserved.
@@ -468 +469 @@
 int main(int argc, char *argv[])
 {
+        loc_srv_t *srv;
+
         if (argc < 2) {
                 usage(argv[0]);
@@ -477 +480 @@
         /* Register server */
         async_set_fallback_port_handler(client_connection, NULL);
-        errno_t rc = loc_server_register(NAME);
+        errno_t rc = loc_server_register(NAME, &srv);
         if (rc != EOK) {
                 printf("%s: Unable to register driver\n", NAME);
@@ -484 +487 @@
 
         service_id_t service_id;
-        rc = loc_service_register(argv[1], &service_id);
+        rc = loc_service_register(srv, argv[1], &service_id);
         if (rc != EOK) {
+                loc_server_unregister(srv);
+
                 printf("%s: Unable to register service %s\n", NAME, argv[1]);
                 return rc;