Changeset 25a179e in mainline for uspace/lib/c/generic/inet/tcp.c

Timestamp:

2017-12-20T19:51:45Z (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:

f96b6c8

Parents:

d4a829e

Message:

IPC return values are always errno constants. Adjust types to reflect that.

In principle, IPC server is not allowed to return non-errno values via
the "main" return value, because kernel interprets it (e.g. EHANGUP).
It's still possible to return arbitrary additional return values alongside EOK,
which are not interpreted in normal communication.

File:

• uspace/lib/c/generic/inet/tcp.c (modified) (11 diffs)

uspace/lib/c/generic/inet/tcp.c

@@ -76 +76 @@
                 return rc;
 
-        sysarg_t retval;
+        int retval;
         async_wait_for(req, &retval);
 
@@ -216 +216 @@
         exch = async_exchange_begin(tcp->sess);
         aid_t req = async_send_0(exch, TCP_CONN_CREATE, &answer);
-        sysarg_t rc = async_data_write_start(exch, (void *)epp,
+        int rc = async_data_write_start(exch, (void *)epp,
             sizeof(inet_ep2_t));
         async_exchange_end(exch);
 
         if (rc != EOK) {
-                sysarg_t rc_orig;
+                int rc_orig;
                 async_wait_for(req, &rc_orig);
                 if (rc_orig != EOK)
@@ -260 +260 @@
 
         exch = async_exchange_begin(conn->tcp->sess);
-        sysarg_t rc = async_req_1_0(exch, TCP_CONN_DESTROY, conn->id);
+        int rc = async_req_1_0(exch, TCP_CONN_DESTROY, conn->id);
         async_exchange_end(exch);
 
@@ -331 +331 @@
         exch = async_exchange_begin(tcp->sess);
         aid_t req = async_send_0(exch, TCP_LISTENER_CREATE, &answer);
-        sysarg_t rc = async_data_write_start(exch, (void *)ep,
+        int rc = async_data_write_start(exch, (void *)ep,
             sizeof(inet_ep_t));
         async_exchange_end(exch);
 
         if (rc != EOK) {
-                sysarg_t rc_orig;
+                int rc_orig;
                 async_wait_for(req, &rc_orig);
                 if (rc_orig != EOK)
@@ -377 +377 @@
 
         exch = async_exchange_begin(lst->tcp->sess);
-        sysarg_t rc = async_req_1_0(exch, TCP_LISTENER_DESTROY, lst->id);
+        int rc = async_req_1_0(exch, TCP_LISTENER_DESTROY, lst->id);
         async_exchange_end(exch);
 
@@ -451 +451 @@
 {
         async_exch_t *exch;
-        sysarg_t rc;
+        int rc;
 
         exch = async_exchange_begin(conn->tcp->sess);
@@ -485 +485 @@
 
         exch = async_exchange_begin(conn->tcp->sess);
-        sysarg_t rc = async_req_1_0(exch, TCP_CONN_SEND_FIN, conn->id);
+        int rc = async_req_1_0(exch, TCP_CONN_SEND_FIN, conn->id);
         async_exchange_end(exch);
 
@@ -501 +501 @@
 
         exch = async_exchange_begin(conn->tcp->sess);
-        sysarg_t rc = async_req_1_0(exch, TCP_CONN_PUSH, conn->id);
+        int rc = async_req_1_0(exch, TCP_CONN_PUSH, conn->id);
         async_exchange_end(exch);
 
@@ -517 +517 @@
 
         exch = async_exchange_begin(conn->tcp->sess);
-        sysarg_t rc = async_req_1_0(exch, TCP_CONN_RESET, conn->id);
+        int rc = async_req_1_0(exch, TCP_CONN_RESET, conn->id);
         async_exchange_end(exch);
 
@@ -562 +562 @@
         }
 
-        sysarg_t retval;
+        int retval;
         async_wait_for(req, &retval);
         if (retval != EOK) {
@@ -616 +616 @@
         }
 
-        sysarg_t retval;
+        int retval;
         async_wait_for(req, &retval);
         if (retval != EOK) {