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

uspace/srv/loader/main.c

@@ -92 +92 @@
 static void ldr_get_taskid(cap_call_handle_t rid, ipc_call_t *request)
 {
-        cap_call_handle_t callid;
+        cap_call_handle_t chandle;
         task_id_t task_id;
         size_t len;
@@ -98 +98 @@
         task_id = task_get_id();
 
-        if (!async_data_read_receive(&callid, &len)) {
-                async_answer_0(callid, EINVAL);
+        if (!async_data_read_receive(&chandle, &len)) {
+                async_answer_0(chandle, EINVAL);
                 async_answer_0(rid, EINVAL);
                 return;
@@ -107 +107 @@
                 len = sizeof(task_id);
 
-        async_data_read_finalize(callid, &task_id, len);
+        async_data_read_finalize(chandle, &task_id, len);
         async_answer_0(rid, EOK);
 }
@@ -138 +138 @@
 static void ldr_set_program(cap_call_handle_t rid, ipc_call_t *request)
 {
-        cap_call_handle_t writeid;
+        cap_call_handle_t write_chandle;
         size_t namesize;
-        if (!async_data_write_receive(&writeid, &namesize)) {
+        if (!async_data_write_receive(&write_chandle, &namesize)) {
                 async_answer_0(rid, EINVAL);
                 return;
@@ -146 +146 @@
 
         char* name = malloc(namesize);
-        errno_t rc = async_data_write_finalize(writeid, name, namesize);
+        errno_t rc = async_data_write_finalize(write_chandle, name, namesize);
         if (rc != EOK) {
                 async_answer_0(rid, EINVAL);
@@ -241 +241 @@
         }
 
-        cap_call_handle_t writeid;
+        cap_call_handle_t write_chandle;
         size_t namesize;
-        if (!async_data_write_receive(&writeid, &namesize)) {
+        if (!async_data_write_receive(&write_chandle, &namesize)) {
                 async_answer_0(rid, EINVAL);
                 return;
@@ -249 +249 @@
 
         char* name = malloc(namesize);
-        errno_t rc = async_data_write_finalize(writeid, name, namesize);
+        errno_t rc = async_data_write_finalize(write_chandle, name, namesize);
         if (rc != EOK) {
                 async_answer_0(rid, EINVAL);
@@ -332 +332 @@
  * to execute the loaded program).
  */
-static void ldr_connection(cap_call_handle_t iid, ipc_call_t *icall, void *arg)
+static void ldr_connection(cap_call_handle_t icall_handle, ipc_call_t *icall, void *arg)
 {
         /* Already have a connection? */
         if (connected) {
-                async_answer_0(iid, ELIMIT);
+                async_answer_0(icall_handle, ELIMIT);
                 return;
         }
@@ -343 +343 @@
 
         /* Accept the connection */
-        async_answer_0(iid, EOK);
+        async_answer_0(icall_handle, EOK);
 
         /* Ignore parameters, the connection is already open */
@@ -351 +351 @@
                 errno_t retval;
                 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))
@@ -358 +358 @@
                 switch (IPC_GET_IMETHOD(call)) {
                 case LOADER_GET_TASKID:
-                        ldr_get_taskid(callid, &call);
+                        ldr_get_taskid(chandle, &call);
                         continue;
                 case LOADER_SET_CWD:
-                        ldr_set_cwd(callid, &call);
+                        ldr_set_cwd(chandle, &call);
                         continue;
                 case LOADER_SET_PROGRAM:
-                        ldr_set_program(callid, &call);
+                        ldr_set_program(chandle, &call);
                         continue;
                 case LOADER_SET_ARGS:
-                        ldr_set_args(callid, &call);
+                        ldr_set_args(chandle, &call);
                         continue;
                 case LOADER_ADD_INBOX:
-                        ldr_add_inbox(callid, &call);
+                        ldr_add_inbox(chandle, &call);
                         continue;
                 case LOADER_LOAD:
-                        ldr_load(callid, &call);
+                        ldr_load(chandle, &call);
                         continue;
                 case LOADER_RUN:
-                        ldr_run(callid, &call);
+                        ldr_run(chandle, &call);
                         /* Not reached */
                 default:
@@ -383 +383 @@
                 }
 
-                async_answer_0(callid, retval);
+                async_answer_0(chandle, retval);
         }
 }