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

Timestamp:

2018-01-30T03:20:45Z (8 years ago)

Author:

Jenda <jenda.jzqk73@…>

Branches:

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

Children:

5a6cc679

Parents:

8bfb163 (diff), 6a5d05b (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge commit '6a5d05bd2551e64111bea4f9332dd7448c26ce84' into forwardport

Separate return value from error code in gen_irq_code*().

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);
 }