Changes in uspace/srv/test/chardev-test/main.c [4c6fd56:fafb8e5] in mainline

File:

• uspace/srv/test/chardev-test/main.c (modified) (4 diffs)

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

@@ -1 +1 @@
 /*
- * Copyright (c) 2023 Jiri Svoboda
+ * Copyright (c) 2017 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, &srv);
+        rc = loc_server_register(NAME);
         if (rc != EOK) {
                 printf("%s: Failed registering server.: %s\n", NAME, str_error(rc));
@@ -141 +140 @@
         partialx_srvs.sarg = NULL;
 
-        rc = loc_service_register(srv, SERVICE_NAME_CHARDEV_TEST_SMALLX,
-            &smallx_svc_id);
+        rc = loc_service_register(SERVICE_NAME_CHARDEV_TEST_SMALLX, &smallx_svc_id);
         if (rc != EOK) {
                 printf("%s: Failed registering service.: %s\n", NAME, str_error(rc));
-                goto error;
-        }
-
-        rc = loc_service_register(srv, SERVICE_NAME_CHARDEV_TEST_LARGEX,
-            &largex_svc_id);
+                return rc;
+        }
+
+        rc = loc_service_register(SERVICE_NAME_CHARDEV_TEST_LARGEX, &largex_svc_id);
         if (rc != EOK) {
                 printf("%s: Failed registering service.: %s\n", NAME, str_error(rc));
-                goto error;
-        }
-
-        rc = loc_service_register(srv, SERVICE_NAME_CHARDEV_TEST_PARTIALX,
-            &partialx_svc_id);
+                return rc;
+        }
+
+        rc = loc_service_register(SERVICE_NAME_CHARDEV_TEST_PARTIALX, &partialx_svc_id);
         if (rc != EOK) {
                 printf("%s: Failed registering service.: %s\n", NAME, str_error(rc));
-                goto error;
+                return rc;
         }
 
@@ -168 +164 @@
         /* 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;
 }