Changeset a46e56b in mainline for uspace/srv/net/dhcp/main.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/srv/net/dhcp/main.c (modified) (5 diffs)

uspace/srv/net/dhcp/main.c

@@ -84 +84 @@
 }
 
-static void dhcp_link_add_srv(cap_call_handle_t callid, ipc_call_t *call)
+static void dhcp_link_add_srv(cap_call_handle_t chandle, ipc_call_t *call)
 {
         sysarg_t link_id;
@@ -94 +94 @@
 
         rc = dhcpsrv_link_add(link_id);
-        async_answer_0(callid, rc);
+        async_answer_0(chandle, rc);
 }
 
-static void dhcp_link_remove_srv(cap_call_handle_t callid, ipc_call_t *call)
+static void dhcp_link_remove_srv(cap_call_handle_t chandle, ipc_call_t *call)
 {
         sysarg_t link_id;
@@ -107 +107 @@
 
         rc = dhcpsrv_link_remove(link_id);
-        async_answer_0(callid, rc);
+        async_answer_0(chandle, rc);
 }
 
-static void dhcp_discover_srv(cap_call_handle_t callid, ipc_call_t *call)
+static void dhcp_discover_srv(cap_call_handle_t chandle, ipc_call_t *call)
 {
         sysarg_t link_id;
@@ -120 +120 @@
 
         rc = dhcpsrv_discover(link_id);
-        async_answer_0(callid, rc);
+        async_answer_0(chandle, rc);
 }
 
-static void dhcp_client_conn(cap_call_handle_t iid, ipc_call_t *icall, void *arg)
+static void dhcp_client_conn(cap_call_handle_t icall_handle, ipc_call_t *icall, void *arg)
 {
         log_msg(LOG_DEFAULT, LVL_DEBUG, "dhcp_client_conn()");
 
         /* Accept the connection */
-        async_answer_0(iid, EOK);
+        async_answer_0(icall_handle, EOK);
 
         while (true) {
                 ipc_call_t call;
-                cap_call_handle_t callid = async_get_call(&call);
+                cap_call_handle_t chandle = async_get_call(&call);
                 sysarg_t method = IPC_GET_IMETHOD(call);
 
                 if (!method) {
                         /* The other side has hung up */
-                        async_answer_0(callid, EOK);
+                        async_answer_0(chandle, EOK);
                         return;
                 }
@@ -143 +143 @@
                 switch (method) {
                 case DHCP_LINK_ADD:
-                        dhcp_link_add_srv(callid, &call);
+                        dhcp_link_add_srv(chandle, &call);
                         break;
                 case DHCP_LINK_REMOVE:
-                        dhcp_link_remove_srv(callid, &call);
+                        dhcp_link_remove_srv(chandle, &call);
                         break;
                 case DHCP_DISCOVER:
-                        dhcp_discover_srv(callid, &call);
+                        dhcp_discover_srv(chandle, &call);
                         break;
                 default:
-                        async_answer_0(callid, EINVAL);
+                        async_answer_0(chandle, EINVAL);
                 }
         }