Changeset a46e56b in mainline for uspace/lib/c/generic/inet.c

Timestamp:

2018-03-22T06:49:35Z (7 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

77f0a1d

Parents:

3e242d2

git-author:

Jakub Jermar <jakub@…> (2018-03-21 23:29:06)

git-committer:

Jakub Jermar <jakub@…> (2018-03-22 06:49:35)

Message:

Prefer handle over ID in naming handle variables

File:

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

uspace/lib/c/generic/inet.c

@@ -36 +36 @@
 #include <stdlib.h>
 
-static void inet_cb_conn(cap_call_handle_t iid, ipc_call_t *icall, void *arg);
+static void inet_cb_conn(cap_call_handle_t icall_handle, ipc_call_t *icall, void *arg);
 
 static async_sess_t *inet_sess = NULL;
@@ -176 +176 @@
 }
 
-static void inet_ev_recv(cap_call_handle_t iid, ipc_call_t *icall)
+static void inet_ev_recv(cap_call_handle_t icall_handle, ipc_call_t *icall)
 {
         inet_dgram_t dgram;
@@ -183 +183 @@
         dgram.iplink = IPC_GET_ARG2(*icall);
 
-        cap_call_handle_t callid;
+        cap_call_handle_t chandle;
         size_t size;
-        if (!async_data_write_receive(&callid, &size)) {
-                async_answer_0(callid, EINVAL);
-                async_answer_0(iid, EINVAL);
+        if (!async_data_write_receive(&chandle, &size)) {
+                async_answer_0(chandle, EINVAL);
+                async_answer_0(icall_handle, EINVAL);
                 return;
         }
 
         if (size != sizeof(inet_addr_t)) {
-                async_answer_0(callid, EINVAL);
-                async_answer_0(iid, EINVAL);
-                return;
-        }
-
-        errno_t rc = async_data_write_finalize(callid, &dgram.src, size);
-        if (rc != EOK) {
-                async_answer_0(callid, rc);
-                async_answer_0(iid, rc);
-                return;
-        }
-
-        if (!async_data_write_receive(&callid, &size)) {
-                async_answer_0(callid, EINVAL);
-                async_answer_0(iid, EINVAL);
+                async_answer_0(chandle, EINVAL);
+                async_answer_0(icall_handle, EINVAL);
+                return;
+        }
+
+        errno_t rc = async_data_write_finalize(chandle, &dgram.src, size);
+        if (rc != EOK) {
+                async_answer_0(chandle, rc);
+                async_answer_0(icall_handle, rc);
+                return;
+        }
+
+        if (!async_data_write_receive(&chandle, &size)) {
+                async_answer_0(chandle, EINVAL);
+                async_answer_0(icall_handle, EINVAL);
                 return;
         }
 
         if (size != sizeof(inet_addr_t)) {
-                async_answer_0(callid, EINVAL);
-                async_answer_0(iid, EINVAL);
-                return;
-        }
-
-        rc = async_data_write_finalize(callid, &dgram.dest, size);
-        if (rc != EOK) {
-                async_answer_0(callid, rc);
-                async_answer_0(iid, rc);
+                async_answer_0(chandle, EINVAL);
+                async_answer_0(icall_handle, EINVAL);
+                return;
+        }
+
+        rc = async_data_write_finalize(chandle, &dgram.dest, size);
+        if (rc != EOK) {
+                async_answer_0(chandle, rc);
+                async_answer_0(icall_handle, rc);
                 return;
         }
@@ -225 +225 @@
         rc = async_data_write_accept(&dgram.data, false, 0, 0, 0, &dgram.size);
         if (rc != EOK) {
-                async_answer_0(iid, rc);
+                async_answer_0(icall_handle, rc);
                 return;
         }
@@ -231 +231 @@
         rc = inet_ev_ops->recv(&dgram);
         free(dgram.data);
-        async_answer_0(iid, rc);
-}
-
-static void inet_cb_conn(cap_call_handle_t iid, ipc_call_t *icall, void *arg)
+        async_answer_0(icall_handle, rc);
+}
+
+static void inet_cb_conn(cap_call_handle_t icall_handle, ipc_call_t *icall, void *arg)
 {
         while (true) {
                 ipc_call_t call;
-                cap_call_handle_t callid = async_get_call(&call);
+                cap_call_handle_t chandle = async_get_call(&call);
 
                 if (!IPC_GET_IMETHOD(call)) {
@@ -247 +247 @@
                 switch (IPC_GET_IMETHOD(call)) {
                 case INET_EV_RECV:
-                        inet_ev_recv(callid, &call);
+                        inet_ev_recv(chandle, &call);
                         break;
                 default:
-                        async_answer_0(callid, ENOTSUP);
+                        async_answer_0(chandle, ENOTSUP);
                 }
         }