Changeset b7fd2a0 in mainline for uspace/lib/c/generic/io/logctl.c

Timestamp:

2018-01-13T03:10:29Z (7 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.

File:

• uspace/lib/c/generic/io/logctl.c (modified) (8 diffs)

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

@@ -43 +43 @@
 static async_sess_t *logger_session = NULL;
 
-static int start_logger_exchange(async_exch_t **exchange_out)
+static errno_t start_logger_exchange(async_exch_t **exchange_out)
 {
         assert(exchange_out != NULL);
@@ -78 +78 @@
  * @return Error code of the conversion or EOK on success.
  */
-int logctl_set_default_level(log_level_t new_level)
+errno_t logctl_set_default_level(log_level_t new_level)
 {
         async_exch_t *exchange = NULL;
-        int rc = start_logger_exchange(&exchange);
+        errno_t rc = start_logger_exchange(&exchange);
         if (rc != EOK)
                 return rc;
 
-        rc = (int) async_req_1_0(exchange,
+        rc = (errno_t) async_req_1_0(exchange,
             LOGGER_CONTROL_SET_DEFAULT_LEVEL, new_level);
 
@@ -101 +101 @@
  * @return Error code of the conversion or EOK on success.
  */
-int logctl_set_log_level(const char *logname, log_level_t new_level)
+errno_t logctl_set_log_level(const char *logname, log_level_t new_level)
 {
         async_exch_t *exchange = NULL;
-        int rc = start_logger_exchange(&exchange);
+        errno_t rc = start_logger_exchange(&exchange);
         if (rc != EOK)
                 return rc;
@@ -111 +111 @@
             new_level, NULL);
         rc = async_data_write_start(exchange, logname, str_size(logname));
-        int reg_msg_rc;
+        errno_t reg_msg_rc;
         async_wait_for(reg_msg, &reg_msg_rc);
 
@@ -119 +119 @@
                 return rc;
 
-        return (int) reg_msg_rc;
+        return (errno_t) reg_msg_rc;
 }
 
@@ -126 +126 @@
  * @return Error code or EOK on success.
  */
-int logctl_set_root(void)
+errno_t logctl_set_root(void)
 {
         async_exch_t *exchange = NULL;
-        int rc = start_logger_exchange(&exchange);
+        errno_t rc = start_logger_exchange(&exchange);
         if (rc != EOK)
                 return rc;
@@ -137 +137 @@
         rc = vfs_pass_handle(vfs_exch, vfs_root(), exchange);
         vfs_exchange_end(vfs_exch);
-        int reg_msg_rc;
+        errno_t reg_msg_rc;
         async_wait_for(reg_msg, &reg_msg_rc);
 
@@ -145 +145 @@
                 return rc;
 
-        return (int) reg_msg_rc;
+        return (errno_t) reg_msg_rc;
 }