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

Timestamp:

2019-02-23T17:16:01Z (5 years ago)

Author:

GitHub <noreply@…>

Branches:

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

Children:

8c193d83, ca0e838

Parents:

bc417660 (diff), 95a47b0 (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.

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2019-02-23 17:16:01)

git-committer:

GitHub <noreply@…> (2019-02-23 17:16:01)

Message:

Merge pull request #157

Turn some function-like macros into functions

File:

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

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

@@ -232 +232 @@
                 goto error;
 
-        conn_id = IPC_GET_ARG1(answer);
+        conn_id = ipc_get_arg1(&answer);
 
         rc = tcp_conn_new(tcp, conn_id, cb, arg, rconn);
@@ -348 +348 @@
 
         lst->tcp = tcp;
-        lst->id = IPC_GET_ARG1(answer);
+        lst->id = ipc_get_arg1(&answer);
         lst->lcb = lcb;
         lst->lcb_arg = larg;
@@ -569 +569 @@
         }
 
-        *nrecv = IPC_GET_ARG1(answer);
+        *nrecv = ipc_get_arg1(&answer);
         fibril_mutex_unlock(&conn->lock);
         return EOK;
@@ -626 +626 @@
         }
 
-        *nrecv = IPC_GET_ARG1(answer);
+        *nrecv = ipc_get_arg1(&answer);
         fibril_mutex_unlock(&conn->lock);
         return EOK;
@@ -643 +643 @@
         errno_t rc;
 
-        conn_id = IPC_GET_ARG1(*icall);
+        conn_id = ipc_get_arg1(icall);
 
         rc = tcp_conn_get(tcp, conn_id, &conn);
@@ -671 +671 @@
         errno_t rc;
 
-        conn_id = IPC_GET_ARG1(*icall);
+        conn_id = ipc_get_arg1(icall);
 
         rc = tcp_conn_get(tcp, conn_id, &conn);
@@ -699 +699 @@
         errno_t rc;
 
-        conn_id = IPC_GET_ARG1(*icall);
+        conn_id = ipc_get_arg1(icall);
 
         rc = tcp_conn_get(tcp, conn_id, &conn);
@@ -727 +727 @@
         errno_t rc;
 
-        conn_id = IPC_GET_ARG1(*icall);
+        conn_id = ipc_get_arg1(icall);
 
         rc = tcp_conn_get(tcp, conn_id, &conn);
@@ -771 +771 @@
         errno_t rc;
 
-        lst_id = IPC_GET_ARG1(*icall);
-        conn_id = IPC_GET_ARG2(*icall);
+        lst_id = ipc_get_arg1(icall);
+        conn_id = ipc_get_arg2(icall);
 
         rc = tcp_listener_get(tcp, lst_id, &lst);
@@ -821 +821 @@
                 async_get_call(&call);
 
-                if (!IPC_GET_IMETHOD(call)) {
+                if (!ipc_get_imethod(&call)) {
                         /* Hangup*/
                         async_answer_0(&call, EOK);
@@ -827 +827 @@
                 }
 
-                switch (IPC_GET_IMETHOD(call)) {
+                switch (ipc_get_imethod(&call)) {
                 case TCP_EV_CONNECTED:
                         tcp_ev_connected(tcp, &call);