Index: uspace/srv/test/chardev-test/main.c
===================================================================
--- uspace/srv/test/chardev-test/main.c	(revision c1694b6b243b360b5f1fbf0629b5e7d4f7f4a515)
+++ uspace/srv/test/chardev-test/main.c	(revision a53ed3a8097360ccf174e8d94fb407db919eb66a)
@@ -39,18 +39,18 @@
 #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;
@@ -106,5 +106,5 @@
 int main(int argc, char *argv[])
 {
-	int rc;
+	errno_t rc;
 
 	printf("%s: Character device test service\n", NAME);
@@ -156,15 +156,15 @@
 }
 
-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)
 {
@@ -178,5 +178,5 @@
 }
 
-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)
 {
@@ -191,15 +191,15 @@
 }
 
-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)
 {
@@ -213,5 +213,5 @@
 }
 
-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)
 {
@@ -226,15 +226,15 @@
 }
 
-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)
 {
@@ -248,5 +248,5 @@
 }
 
-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)
 {