Changes in uspace/srv/test/chardev-test/main.c [57914494:b7fd2a0] in mainline

File:

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

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

@@ -29 +29 @@
 #include <async.h>
 #include <errno.h>
+#include <str_error.h>
 #include <io/chardev_srv.h>
 #include <ipc/services.h>
@@ -38 +39 @@
 #define NAME  "chardev-test"
 
-static int smallx_open(chardev_srvs_t *, chardev_srv_t *);
-static int smallx_close(chardev_srv_t *);
-static int smallx_write(chardev_srv_t *, const void *, size_t, size_t *);
-static int smallx_read(chardev_srv_t *, void *, size_t, size_t *);
-
-static int largex_open(chardev_srvs_t *, chardev_srv_t *);
-static int largex_close(chardev_srv_t *);
-static int largex_write(chardev_srv_t *, const void *, size_t, size_t *);
-static int largex_read(chardev_srv_t *, void *, size_t, size_t *);
-
-static int partialx_open(chardev_srvs_t *, chardev_srv_t *);
-static int partialx_close(chardev_srv_t *);
-static int partialx_write(chardev_srv_t *, const void *, size_t, size_t *);
-static int partialx_read(chardev_srv_t *, void *, size_t, size_t *);
+static errno_t smallx_open(chardev_srvs_t *, chardev_srv_t *);
+static errno_t smallx_close(chardev_srv_t *);
+static errno_t smallx_write(chardev_srv_t *, const void *, size_t, size_t *);
+static errno_t smallx_read(chardev_srv_t *, void *, size_t, size_t *);
+
+static errno_t largex_open(chardev_srvs_t *, chardev_srv_t *);
+static errno_t largex_close(chardev_srv_t *);
+static errno_t largex_write(chardev_srv_t *, const void *, size_t, size_t *);
+static errno_t largex_read(chardev_srv_t *, void *, size_t, size_t *);
+
+static errno_t partialx_open(chardev_srvs_t *, chardev_srv_t *);
+static errno_t partialx_close(chardev_srv_t *);
+static errno_t partialx_write(chardev_srv_t *, const void *, size_t, size_t *);
+static errno_t partialx_read(chardev_srv_t *, void *, size_t, size_t *);
 
 static service_id_t smallx_svc_id;
@@ -105 +106 @@
 int main(int argc, char *argv[])
 {
-        int rc;
+        errno_t rc;
 
         printf("%s: Character device test service\n", NAME);
@@ -112 +113 @@
         rc = loc_server_register(NAME);
         if (rc != EOK) {
-                printf("%s: Failed registering server. (%d)\n", NAME, rc);
+                printf("%s: Failed registering server.: %s\n", NAME, str_error(rc));
                 return rc;
         }
@@ -130 +131 @@
         rc = loc_service_register(SERVICE_NAME_CHARDEV_TEST_SMALLX, &smallx_svc_id);
         if (rc != EOK) {
-                printf("%s: Failed registering service. (%d)\n", NAME, rc);
+                printf("%s: Failed registering service.: %s\n", NAME, str_error(rc));
                 return rc;
         }
@@ -136 +137 @@
         rc = loc_service_register(SERVICE_NAME_CHARDEV_TEST_LARGEX, &largex_svc_id);
         if (rc != EOK) {
-                printf("%s: Failed registering service. (%d)\n", NAME, rc);
+                printf("%s: Failed registering service.: %s\n", NAME, str_error(rc));
                 return rc;
         }
@@ -142 +143 @@
         rc = loc_service_register(SERVICE_NAME_CHARDEV_TEST_PARTIALX, &partialx_svc_id);
         if (rc != EOK) {
-                printf("%s: Failed registering service. (%d)\n", NAME, rc);
+                printf("%s: Failed registering service.: %s\n", NAME, str_error(rc));
                 return rc;
         }
@@ -155 +156 @@
 }
 
-static int smallx_open(chardev_srvs_t *srvs, chardev_srv_t *srv)
-{
-        return EOK;
-}
-
-static int smallx_close(chardev_srv_t *srv)
-{
-        return EOK;
-}
-
-static int smallx_write(chardev_srv_t *srv, const void *data, size_t size,
+static errno_t smallx_open(chardev_srvs_t *srvs, chardev_srv_t *srv)
+{
+        return EOK;
+}
+
+static errno_t smallx_close(chardev_srv_t *srv)
+{
+        return EOK;
+}
+
+static errno_t smallx_write(chardev_srv_t *srv, const void *data, size_t size,
     size_t *nwritten)
 {
@@ -177 +178 @@
 }
 
-static int smallx_read(chardev_srv_t *srv, void *buf, size_t size,
+static errno_t smallx_read(chardev_srv_t *srv, void *buf, size_t size,
     size_t *nread)
 {
@@ -190 +191 @@
 }
 
-static int largex_open(chardev_srvs_t *srvs, chardev_srv_t *srv)
-{
-        return EOK;
-}
-
-static int largex_close(chardev_srv_t *srv)
-{
-        return EOK;
-}
-
-static int largex_write(chardev_srv_t *srv, const void *data, size_t size,
+static errno_t largex_open(chardev_srvs_t *srvs, chardev_srv_t *srv)
+{
+        return EOK;
+}
+
+static errno_t largex_close(chardev_srv_t *srv)
+{
+        return EOK;
+}
+
+static errno_t largex_write(chardev_srv_t *srv, const void *data, size_t size,
     size_t *nwritten)
 {
@@ -212 +213 @@
 }
 
-static int largex_read(chardev_srv_t *srv, void *buf, size_t size,
+static errno_t largex_read(chardev_srv_t *srv, void *buf, size_t size,
     size_t *nread)
 {
@@ -225 +226 @@
 }
 
-static int partialx_open(chardev_srvs_t *srvs, chardev_srv_t *srv)
-{
-        return EOK;
-}
-
-static int partialx_close(chardev_srv_t *srv)
-{
-        return EOK;
-}
-
-static int partialx_write(chardev_srv_t *srv, const void *data, size_t size,
+static errno_t partialx_open(chardev_srvs_t *srvs, chardev_srv_t *srv)
+{
+        return EOK;
+}
+
+static errno_t partialx_close(chardev_srv_t *srv)
+{
+        return EOK;
+}
+
+static errno_t partialx_write(chardev_srv_t *srv, const void *data, size_t size,
     size_t *nwritten)
 {
@@ -247 +248 @@
 }
 
-static int partialx_read(chardev_srv_t *srv, void *buf, size_t size,
+static errno_t partialx_read(chardev_srv_t *srv, void *buf, size_t size,
     size_t *nread)
 {