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

Timestamp:

2018-03-22T06:49:35Z (6 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/iplink.c (modified) (8 diffs)

uspace/lib/c/generic/iplink.c

@@ -45 +45 @@
 #include <stdlib.h>
 
-static void iplink_cb_conn(cap_call_handle_t iid, ipc_call_t *icall, void *arg);
+static void iplink_cb_conn(cap_call_handle_t icall_handle, ipc_call_t *icall, void *arg);
 
 errno_t iplink_open(async_sess_t *sess, iplink_ev_ops_t *ev_ops, void *arg,
@@ -245 +245 @@
 }
 
-static void iplink_ev_recv(iplink_t *iplink, cap_call_handle_t iid,
+static void iplink_ev_recv(iplink_t *iplink, cap_call_handle_t icall_handle,
     ipc_call_t *icall)
 {
@@ -255 +255 @@
             &sdu.size);
         if (rc != EOK) {
-                async_answer_0(iid, rc);
+                async_answer_0(icall_handle, rc);
                 return;
         }
@@ -261 +261 @@
         rc = iplink->ev_ops->recv(iplink, &sdu, ver);
         free(sdu.data);
-        async_answer_0(iid, rc);
-}
-
-static void iplink_ev_change_addr(iplink_t *iplink, cap_call_handle_t iid,
+        async_answer_0(icall_handle, rc);
+}
+
+static void iplink_ev_change_addr(iplink_t *iplink, cap_call_handle_t icall_handle,
     ipc_call_t *icall)
 {
@@ -273 +273 @@
             sizeof(addr48_t), sizeof(addr48_t), 0, &size);
         if (rc != EOK) {
-                async_answer_0(iid, rc);
+                async_answer_0(icall_handle, rc);
                 return;
         }
@@ -279 +279 @@
         rc = iplink->ev_ops->change_addr(iplink, *addr);
         free(addr);
-        async_answer_0(iid, EOK);
-}
-
-static void iplink_cb_conn(cap_call_handle_t iid, ipc_call_t *icall, void *arg)
+        async_answer_0(icall_handle, EOK);
+}
+
+static void iplink_cb_conn(cap_call_handle_t icall_handle, ipc_call_t *icall, void *arg)
 {
         iplink_t *iplink = (iplink_t *) arg;
@@ -288 +288 @@
         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)) {
@@ -297 +297 @@
                 switch (IPC_GET_IMETHOD(call)) {
                 case IPLINK_EV_RECV:
-                        iplink_ev_recv(iplink, callid, &call);
+                        iplink_ev_recv(iplink, chandle, &call);
                         break;
                 case IPLINK_EV_CHANGE_ADDR:
-                        iplink_ev_change_addr(iplink, callid, &call);
+                        iplink_ev_change_addr(iplink, chandle, &call);
                         break;
                 default:
-                        async_answer_0(callid, ENOTSUP);
+                        async_answer_0(chandle, ENOTSUP);
                 }
         }