Changeset b7fd2a0 in mainline for uspace/srv/logger

Timestamp:

2018-01-13T03:10:29Z (8 years ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Branches:

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

Children:

a53ed3a

Parents:

36f0738

Message:

Use errno_t in all uspace and kernel code.

Change type of every variable, parameter and return value that holds an
<errno.h> constant to either errno_t (the usual case), or sys_errno_t
(some places in kernel). This is for the purpose of self-documentation,
as well as for type-checking with a bit of type definition hackery.

Although this is a massive commit, it is a simple text replacement, and thus
is very easy to verify. Simply do the following:

`
git checkout <this commit's hash>
git reset HEAD
<sup>git add .
tools/srepl '\berrno_t\b' int
git add .
tools/srepl '\bsys_errno_t\b' sysarg_t
git reset
git diff
`</sup>

While this doesn't ensure that the replacements are correct, it does ensure
that the commit doesn't do anything except those replacements. Since errno_t
is typedef'd to int in the usual case (and sys_errno_t to sysarg_t), even if
incorrect, this commit cannot change behavior.

Location:

uspace/srv/logger

Files:

• ctl.c (modified) (3 diffs)
• initlvl.c (modified) (2 diffs)
• level.c (modified) (1 diff)
• logger.h (modified) (1 diff)
• logs.c (modified) (2 diffs)
• main.c (modified) (1 diff)
• writer.c (modified) (4 diffs)

uspace/srv/logger/ctl.c

@@ -43 +43 @@
 #include "logger.h"
 
-static int handle_log_level_change(sysarg_t new_level)
+static errno_t handle_log_level_change(sysarg_t new_level)
 {
         void *full_name;
-        int rc = async_data_write_accept(&full_name, true, 0, 0, 0, NULL);
+        errno_t rc = async_data_write_accept(&full_name, true, 0, 0, 0, NULL);
         if (rc != EOK) {
                 return rc;
@@ -77 +77 @@
                 switch (IPC_GET_IMETHOD(call)) {
                 case LOGGER_CONTROL_SET_DEFAULT_LEVEL: {
-                        int rc = set_default_logging_level(IPC_GET_ARG1(call));
+                        errno_t rc = set_default_logging_level(IPC_GET_ARG1(call));
                         async_answer_0(callid, rc);
                         break;
                 }
                 case LOGGER_CONTROL_SET_LOG_LEVEL: {
-                        int rc = handle_log_level_change(IPC_GET_ARG1(call));
+                        errno_t rc = handle_log_level_change(IPC_GET_ARG1(call));
                         async_answer_0(callid, rc);
                         break;
@@ -88 +88 @@
                 case LOGGER_CONTROL_SET_ROOT: {
                         int fd;
-                        int rc = vfs_receive_handle(true, &fd);
+                        errno_t rc = vfs_receive_handle(true, &fd);
                         if (rc == EOK) {
                                 rc = vfs_root_set(fd);

uspace/srv/logger/initlvl.c

@@ -50 +50 @@
         if (value == NULL) {
                 log_level_t level;
-                int rc = log_level_from_str(key, &level);
+                errno_t rc = log_level_from_str(key, &level);
                 if (rc != EOK)
                         return;
@@ -59 +59 @@
 
         log_level_t level;
-        int rc = log_level_from_str(value, &level);
+        errno_t rc = log_level_from_str(value, &level);
         if (rc != EOK)
                 return;

uspace/srv/logger/level.c

@@ -49 +49 @@
 }
 
-int set_default_logging_level(log_level_t new_level)
+errno_t set_default_logging_level(log_level_t new_level)
 {
         if (new_level >= LVL_LIMIT)

uspace/srv/logger/logger.h

@@ -95 +95 @@
 
 log_level_t get_default_logging_level(void);
-int set_default_logging_level(log_level_t);
+errno_t set_default_logging_level(log_level_t);
 
 

uspace/srv/logger/logs.c

@@ -52 +52 @@
 }
 
-static int create_dest(const char *name, logger_dest_t **dest)
+static errno_t create_dest(const char *name, logger_dest_t **dest)
 {
         logger_dest_t *result = malloc(sizeof(logger_dest_t));
@@ -86 +86 @@
                 if (result->full_name == NULL)
                         goto error;
-                int rc = create_dest(name, &result->dest);
+                errno_t rc = create_dest(name, &result->dest);
                 if (rc != EOK)
                         goto error;

uspace/srv/logger/main.c

@@ -70 +70 @@
         
         port_id_t port;
-        int rc = async_create_port(INTERFACE_LOGGER_CONTROL,
+        errno_t rc = async_create_port(INTERFACE_LOGGER_CONTROL,
             connection_handler_control, NULL, &port);
         if (rc != EOK) {

uspace/srv/logger/writer.c

@@ -53 +53 @@
 {
         void *name;
-        int rc = async_data_write_accept(&name, true, 1, 0, 0, NULL);
+        errno_t rc = async_data_write_accept(&name, true, 1, 0, 0, NULL);
         if (rc != EOK)
                 return NULL;
@@ -64 +64 @@
 }
 
-static int handle_receive_message(sysarg_t log_id, sysarg_t level)
+static errno_t handle_receive_message(sysarg_t log_id, sysarg_t level)
 {
         logger_log_t *log = find_log_by_id_and_lock(log_id);
@@ -71 +71 @@
 
         void *message = NULL;
-        int rc = async_data_write_accept(&message, true, 1, 0, 0, NULL);
+        errno_t rc = async_data_write_accept(&message, true, 1, 0, 0, NULL);
         if (rc != EOK)
                 goto leave;
@@ -128 +128 @@
                 }
                 case LOGGER_WRITER_MESSAGE: {
-                        int rc = handle_receive_message(IPC_GET_ARG1(call),
+                        errno_t rc = handle_receive_message(IPC_GET_ARG1(call),
                             IPC_GET_ARG2(call));
                         async_answer_0(callid, rc);