Changeset a46e56b in mainline for uspace/srv/logger

Timestamp:

2018-03-22T06:49:35Z (8 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

Location:

uspace/srv/logger

Files:

• ctl.c (modified) (3 diffs)
• main.c (modified) (1 diff)
• writer.c (modified) (4 diffs)

uspace/srv/logger/ctl.c

@@ -63 +63 @@
 }
 
-void logger_connection_handler_control(cap_call_handle_t callid)
+void logger_connection_handler_control(cap_call_handle_t chandle)
 {
         errno_t rc;
         int fd;
 
-        async_answer_0(callid, EOK);
+        async_answer_0(chandle, EOK);
         logger_log("control: new client.\n");
 
         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))
@@ -81 +81 @@
                 case LOGGER_CONTROL_SET_DEFAULT_LEVEL:
                         rc = set_default_logging_level(IPC_GET_ARG1(call));
-                        async_answer_0(callid, rc);
+                        async_answer_0(chandle, rc);
                         break;
                 case LOGGER_CONTROL_SET_LOG_LEVEL:
                         rc = handle_log_level_change(IPC_GET_ARG1(call));
-                        async_answer_0(callid, rc);
+                        async_answer_0(chandle, rc);
                         break;
                 case LOGGER_CONTROL_SET_ROOT:
@@ -93 +93 @@
                                 vfs_put(fd);
                         }
-                        async_answer_0(callid, rc);
+                        async_answer_0(chandle, rc);
                         break;
                 default:
-                        async_answer_0(callid, EINVAL);
+                        async_answer_0(chandle, EINVAL);
                         break;
                 }

uspace/srv/logger/main.c

@@ -48 +48 @@
 #include "logger.h"
 
-static void connection_handler_control(cap_call_handle_t iid, ipc_call_t *icall,
+static void connection_handler_control(cap_call_handle_t icall_handle, ipc_call_t *icall,
     void *arg)
 {
-        logger_connection_handler_control(iid);
+        logger_connection_handler_control(icall_handle);
 }
 
-static void connection_handler_writer(cap_call_handle_t iid, ipc_call_t *icall,
+static void connection_handler_writer(cap_call_handle_t icall_handle, ipc_call_t *icall,
     void *arg)
 {
-        logger_connection_handler_writer(iid);
+        logger_connection_handler_writer(icall_handle);
 }
 

uspace/srv/logger/writer.c

@@ -94 +94 @@
 }
 
-void logger_connection_handler_writer(cap_call_handle_t callid)
+void logger_connection_handler_writer(cap_call_handle_t chandle)
 {
         logger_log_t *log;
@@ -100 +100 @@
 
         /* Acknowledge the connection. */
-        async_answer_0(callid, EOK);
+        async_answer_0(chandle, EOK);
 
         logger_log("writer: new client.\n");
@@ -109 +109 @@
         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))
@@ -118 +118 @@
                         log = handle_create_log(IPC_GET_ARG1(call));
                         if (log == NULL) {
-                                async_answer_0(callid, ENOMEM);
+                                async_answer_0(chandle, ENOMEM);
                                 break;
                         }
                         if (!register_log(&registered_logs, log)) {
                                 log_unlock(log);
-                                async_answer_0(callid, ELIMIT);
+                                async_answer_0(chandle, ELIMIT);
                                 break;
                         }
                         log_unlock(log);
-                        async_answer_1(callid, EOK, (sysarg_t) log);
+                        async_answer_1(chandle, EOK, (sysarg_t) log);
                         break;
                 case LOGGER_WRITER_MESSAGE:
                         rc = handle_receive_message(IPC_GET_ARG1(call),
                             IPC_GET_ARG2(call));
-                        async_answer_0(callid, rc);
+                        async_answer_0(chandle, rc);
                         break;
                 default:
-                        async_answer_0(callid, EINVAL);
+                        async_answer_0(chandle, EINVAL);
                         break;
                 }