Changeset a46e56b in mainline for uspace/srv/ns/clonable.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/ns/clonable.c (modified) (9 diffs)

uspace/srv/ns/clonable.c

@@ -48 +48 @@
         service_t service;
         iface_t iface;
-        cap_call_handle_t callid;
+        cap_call_handle_t chandle;
         sysarg_t arg3;
 } cs_req_t;
@@ -75 +75 @@
  */
 void register_clonable(service_t service, sysarg_t phone, ipc_call_t *call,
-    cap_call_handle_t callid)
+    cap_call_handle_t chandle)
 {
         link_t *req_link = list_first(&cs_req);
@@ -81 +81 @@
                 /* There was no pending connection request. */
                 printf("%s: Unexpected clonable server.\n", NAME);
-                async_answer_0(callid, EBUSY);
+                async_answer_0(chandle, EBUSY);
                 return;
         }
@@ -91 +91 @@
         assert(csr->service == SERVICE_LOADER);
 
-        async_answer_0(callid, EOK);
+        async_answer_0(chandle, EOK);
 
         async_sess_t *sess = async_callback_receive(EXCHANGE_SERIALIZE);
         if (sess == NULL)
-                async_answer_0(callid, EIO);
+                async_answer_0(chandle, EIO);
 
         async_exch_t *exch = async_exchange_begin(sess);
-        async_forward_fast(csr->callid, exch, csr->iface, csr->arg3, 0,
+        async_forward_fast(csr->chandle, exch, csr->iface, csr->arg3, 0,
             IPC_FF_NONE);
         async_exchange_end(exch);
@@ -111 +111 @@
  * @param iface   Interface to be connected to.
  * @param call    Pointer to call structure.
- * @param callid  Call ID of the request.
+ * @param chandle  Call ID of the request.
  *
  * @return Zero on success or a value from @ref errno.h.
@@ -117 +117 @@
  */
 void connect_to_clonable(service_t service, iface_t iface, ipc_call_t *call,
-    cap_call_handle_t callid)
+    cap_call_handle_t chandle)
 {
         assert(service == SERVICE_LOADER);
@@ -123 +123 @@
         cs_req_t *csr = malloc(sizeof(cs_req_t));
         if (csr == NULL) {
-                async_answer_0(callid, ENOMEM);
+                async_answer_0(chandle, ENOMEM);
                 return;
         }
@@ -132 +132 @@
         if (rc != EOK) {
                 free(csr);
-                async_answer_0(callid, rc);
+                async_answer_0(chandle, rc);
                 return;
         }
@@ -139 +139 @@
         csr->service = service;
         csr->iface = iface;
-        csr->callid = callid;
+        csr->chandle = chandle;
         csr->arg3 = IPC_GET_ARG3(*call);