Changeset 1c6c3e1d in mainline for uspace/srv/clipboard/clipboard.c

Timestamp:

2023-10-22T17:55:33Z (15 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/clipboard/clipboard.c (modified) (3 diffs)

uspace/srv/clipboard/clipboard.c

@@ -1 +1 @@
 /*
+ * Copyright (c) 2023 Jiri Svoboda
  * Copyright (c) 2009 Martin Decky
  * All rights reserved.
@@ -185 +186 @@
 {
         errno_t rc;
+        loc_srv_t *srv;
 
         printf("%s: HelenOS clipboard service\n", NAME);
         async_set_fallback_port_handler(clip_connection, NULL);
 
-        rc = loc_server_register(NAME);
+        rc = loc_server_register(NAME, &srv);
         if (rc != EOK) {
                 printf("%s: Failed registering server: %s\n", NAME, str_error(rc));
@@ -195 +197 @@
         }
 
-        rc = loc_service_register(SERVICE_NAME_CLIPBOARD, &svc_id);
+        rc = loc_service_register(srv, SERVICE_NAME_CLIPBOARD, &svc_id);
         if (rc != EOK) {
+                loc_server_unregister(srv);
+
                 printf("%s: Failed registering service : %s\n", NAME, str_error(rc));
                 return rc;