Changeset b7fd2a0 in mainline for kernel/generic/src/log/log.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:

• kernel/generic/src/log/log.c (modified) (6 diffs)

kernel/generic/src/log/log.c

@@ -221 +221 @@
                 
                 size_t buffer_offset = 0;
-                int rc = chr_encode(wstr[chars], buffer, &buffer_offset, 16);
+                errno_t rc = chr_encode(wstr[chars], buffer, &buffer_offset, 16);
                 if (rc != EOK) {
                         return EOF;
@@ -293 +293 @@
  *
  */
-sysarg_t sys_klog(sysarg_t operation, void *buf, size_t size,
+sys_errno_t sys_klog(sysarg_t operation, void *buf, size_t size,
     sysarg_t level, size_t *uspace_nread)
 {
         char *data;
-        int rc;
+        errno_t rc;
         
         if (size > PAGE_SIZE)
-                return (sysarg_t) ELIMIT;
+                return (sys_errno_t) ELIMIT;
         
         switch (operation) {
@@ -306 +306 @@
                         data = (char *) malloc(size + 1, 0);
                         if (!data)
-                                return (sysarg_t) ENOMEM;
+                                return (sys_errno_t) ENOMEM;
                         
                         rc = copy_from_uspace(data, buf, size);
                         if (rc) {
                                 free(data);
-                                return (sysarg_t) rc;
+                                return (sys_errno_t) rc;
                         }
                         data[size] = 0;
@@ -325 +325 @@
                         data = (char *) malloc(size, 0);
                         if (!data)
-                                return (sysarg_t) ENOMEM;
+                                return (sys_errno_t) ENOMEM;
                         
                         size_t entry_len = 0;
@@ -366 +366 @@
                         if (rc != EOK) {
                                 free(data);
-                                return (sysarg_t) rc;
+                                return (sys_errno_t) rc;
                         }
                         
@@ -374 +374 @@
                         
                         if (rc != EOK)
-                                return (sysarg_t) rc;
+                                return (sys_errno_t) rc;
                         
                         return copy_to_uspace(uspace_nread, &copied, sizeof(copied));
                         return EOK;
                 default:
-                        return (sysarg_t) ENOTSUP;
+                        return (sys_errno_t) ENOTSUP;
         }
 }