Changeset 1c6c3e1d in mainline for uspace/srv/test/chardev-test/main.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/test/chardev-test/main.c (modified) (4 diffs)

uspace/srv/test/chardev-test/main.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2017 Jiri Svoboda
+ * Copyright (c) 2023 Jiri Svoboda
  * All rights reserved.
  *
@@ -118 +118 @@
 {
         errno_t rc;
+        loc_srv_t *srv;
 
         printf("%s: Character device test service\n", NAME);
         async_set_fallback_port_handler(chardev_test_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));
@@ -140 +141 @@
         partialx_srvs.sarg = NULL;
 
-        rc = loc_service_register(SERVICE_NAME_CHARDEV_TEST_SMALLX, &smallx_svc_id);
+        rc = loc_service_register(srv, SERVICE_NAME_CHARDEV_TEST_SMALLX,
+            &smallx_svc_id);
         if (rc != EOK) {
                 printf("%s: Failed registering service.: %s\n", NAME, str_error(rc));
-                return rc;
-        }
-
-        rc = loc_service_register(SERVICE_NAME_CHARDEV_TEST_LARGEX, &largex_svc_id);
+                goto error;
+        }
+
+        rc = loc_service_register(srv, SERVICE_NAME_CHARDEV_TEST_LARGEX,
+            &largex_svc_id);
         if (rc != EOK) {
                 printf("%s: Failed registering service.: %s\n", NAME, str_error(rc));
-                return rc;
-        }
-
-        rc = loc_service_register(SERVICE_NAME_CHARDEV_TEST_PARTIALX, &partialx_svc_id);
+                goto error;
+        }
+
+        rc = loc_service_register(srv, SERVICE_NAME_CHARDEV_TEST_PARTIALX,
+            &partialx_svc_id);
         if (rc != EOK) {
                 printf("%s: Failed registering service.: %s\n", NAME, str_error(rc));
-                return rc;
+                goto error;
         }
 
@@ -164 +168 @@
         /* Not reached */
         return 0;
+error:
+        if (smallx_svc_id != 0)
+                loc_service_unregister(srv, smallx_svc_id);
+        if (largex_svc_id != 0)
+                loc_service_unregister(srv, largex_svc_id);
+        if (partialx_svc_id != 0)
+                loc_service_unregister(srv, partialx_svc_id);
+        loc_server_unregister(srv);
+        return rc;
 }