Changes in uspace/lib/c/generic/io/con_srv.c [b7fd2a0:8d2dd7f2] in mainline

File:

• uspace/lib/c/generic/io/con_srv.c (modified) (11 diffs)

uspace/lib/c/generic/io/con_srv.c

@@ -42 +42 @@
 #include <io/con_srv.h>
 
-static errno_t console_ev_encode(cons_event_t *event, ipc_call_t *call)
+static int console_ev_encode(cons_event_t *event, ipc_call_t *call)
 {
         IPC_SET_ARG1(*call, event->type);
@@ -71 +71 @@
         void *buf;
         size_t size;
-        errno_t rc;
+        int rc;
         ipc_callid_t rcallid;
 
@@ -93 +93 @@
         }
 
-        size_t nread;
-        rc = srv->srvs->ops->read(srv, buf, size, &nread);
-        if (rc != EOK) {
+        rc = srv->srvs->ops->read(srv, buf, size);
+        if (rc < 0) {
                 async_answer_0(rcallid, rc);
                 async_answer_0(callid, rc);
@@ -102 +101 @@
         }
 
-        async_data_read_finalize(rcallid, buf, nread);
+        async_data_read_finalize(rcallid, buf, size);
         free(buf);
 
-        async_answer_1(callid, EOK, nread);
+        if (rc >= 0)
+                async_answer_1(callid, EOK, rc);
+        else
+                async_answer_0(callid, rc);
 }
 
@@ -113 +115 @@
         void *data;
         size_t size;
-        errno_t rc;
+        int rc;
 
         rc = async_data_write_accept(&data, false, 0, 0, 0, &size);
@@ -126 +128 @@
         }
 
-        size_t nwritten = 0;
-        rc = srv->srvs->ops->write(srv, data, size, &nwritten);
+        rc = srv->srvs->ops->write(srv, data, size);
         free(data);
 
-        async_answer_1(callid, rc, nwritten);
+        if (rc >= 0)
+                async_answer_1(callid, EOK, rc);
+        else
+                async_answer_0(callid, rc);
 }
 
@@ -178 +182 @@
     ipc_call_t *call)
 {
-        errno_t rc;
+        int rc;
         sysarg_t col;
         sysarg_t row;
@@ -194 +198 @@
     ipc_call_t *call)
 {
-        errno_t rc;
+        int rc;
         sysarg_t cols;
         sysarg_t rows;
@@ -210 +214 @@
     ipc_call_t *call)
 {
-        errno_t rc;
+        int rc;
         console_caps_t ccap;
 
@@ -295 +299 @@
     ipc_call_t *call)
 {
-        errno_t rc;
+        int rc;
         cons_event_t event;
         ipc_call_t result;
@@ -340 +344 @@
 }
 
-errno_t con_conn(ipc_callid_t iid, ipc_call_t *icall, con_srvs_t *srvs)
+int con_conn(ipc_callid_t iid, ipc_call_t *icall, con_srvs_t *srvs)
 {
         con_srv_t *srv;
-        errno_t rc;
+        int rc;
 
         /* Accept the connection */