Changeset c8211849 in mainline for uspace/lib/c/generic/io/con_srv.c

Timestamp:

2017-12-08T21:03:35Z (6 years ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

a99cbc1e

Parents:

c19a5a59

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2017-12-07 23:08:49)

git-committer:

Jiří Zárevúcky <zarevucky.jiri@…> (2017-12-08 21:03:35)

Message:

Return number of characters separately from error code in console IO.

File:

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

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

@@ -93 +93 @@
         }
 
-        rc = srv->srvs->ops->read(srv, buf, size);
-        if (rc < 0) {
+        size_t nread;
+        rc = srv->srvs->ops->read(srv, buf, size, &nread);
+        if (rc != EOK) {
                 async_answer_0(rcallid, rc);
                 async_answer_0(callid, rc);
@@ -101 +102 @@
         }
 
-        async_data_read_finalize(rcallid, buf, size);
+        async_data_read_finalize(rcallid, buf, nread);
         free(buf);
 
-        if (rc >= 0)
-                async_answer_1(callid, EOK, rc);
-        else
-                async_answer_0(callid, rc);
+        async_answer_1(callid, EOK, nread);
 }
 
@@ -128 +126 @@
         }
 
-        rc = srv->srvs->ops->write(srv, data, size);
+        size_t nwritten = 0;
+        rc = srv->srvs->ops->write(srv, data, size, &nwritten);
         free(data);
 
-        if (rc >= 0)
-                async_answer_1(callid, EOK, rc);
-        else
-                async_answer_0(callid, rc);
+        async_answer_1(callid, rc, nwritten);
 }