Changeset 6e596bd in mainline

Timestamp:

2012-08-17T10:04:49Z (12 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

bf9ac4e8

Parents:

b1912b0c

Message:

Enum renaming

Location:

uspace

Files:

• lib/c/generic/io/log.c (modified) (1 diff)
• lib/c/generic/io/logctl.c (modified) (2 diffs)
• lib/c/include/ipc/logger.h (modified) (2 diffs)
• srv/logger/ctl.c (modified) (1 diff)
• srv/logger/main.c (modified) (1 diff)

uspace/lib/c/generic/io/log.c

@@ -145 +145 @@
                 return ENOMEM;
 
-        logger_session = service_connect_blocking(EXCHANGE_SERIALIZE, SERVICE_LOGGER, LOGGER_INTERFACE_SINK, 0);
+        logger_session = service_connect_blocking(EXCHANGE_SERIALIZE, SERVICE_LOGGER, LOGGER_INTERFACE_WRITER, 0);
         if (logger_session == NULL) {
                 return ENOMEM;

uspace/lib/c/generic/io/logctl.c

@@ -74 +74 @@
 
         rc = (int) async_req_1_0(exchange,
-            LOGGER_CTL_SET_DEFAULT_LEVEL, new_level);
+            LOGGER_CONTROL_SET_DEFAULT_LEVEL, new_level);
 
         async_exchange_end(exchange);
@@ -88 +88 @@
                 return rc;
 
-        aid_t reg_msg = async_send_1(exchange, LOGGER_CTL_SET_LOG_LEVEL,
+        aid_t reg_msg = async_send_1(exchange, LOGGER_CONTROL_SET_LOG_LEVEL,
             new_level, NULL);
         rc = async_data_write_start(exchange, logname, str_size(logname));

uspace/lib/c/include/ipc/logger.h

@@ -37 +37 @@
 
 typedef enum {
-        LOGGER_CTL_SET_DEFAULT_LEVEL = IPC_FIRST_USER_METHOD,
-        LOGGER_CTL_SET_LOG_LEVEL
+        LOGGER_CONTROL_SET_DEFAULT_LEVEL = IPC_FIRST_USER_METHOD,
+        LOGGER_CONTROL_SET_LOG_LEVEL
 } logger_control_request_t;
 
@@ -48 +48 @@
 
 typedef enum {
-         LOGGER_CONNECT = IPC_FIRST_USER_METHOD,
-         LOGGER_GET_MESSAGE
-} logger_source_request_t;
-
-typedef enum {
         /** Interface for controlling logger behavior. */
         LOGGER_INTERFACE_CONTROL,
         /** Interface for servers writing to the log. */
-        LOGGER_INTERFACE_SINK,
-        /** Interface for clients displaying the log. */
-        LOGGER_INTERFACE_SOURCE
+        LOGGER_INTERFACE_WRITER
 } logger_interface_t;
 

uspace/srv/logger/ctl.c

@@ -74 +74 @@
 
                 switch (IPC_GET_IMETHOD(call)) {
-                case LOGGER_CTL_SET_DEFAULT_LEVEL: {
+                case LOGGER_CONTROL_SET_DEFAULT_LEVEL: {
                         int rc = set_default_logging_level(IPC_GET_ARG1(call));
                         async_answer_0(callid, rc);
                         break;
                 }
-                case LOGGER_CTL_SET_LOG_LEVEL: {
+                case LOGGER_CONTROL_SET_LOG_LEVEL: {
                         int rc = handle_log_level_change(IPC_GET_ARG1(call));
                         async_answer_0(callid, rc);

uspace/srv/logger/main.c

@@ -56 +56 @@
                 logger_connection_handler_control(iid);
                 break;
-        case LOGGER_INTERFACE_SINK:
+        case LOGGER_INTERFACE_WRITER:
                 logger_connection_handler_writer(iid);
                 break;