Changeset b7fd2a0 in mainline for kernel/generic/src/console

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:

kernel/generic/src/console

Files:

• cmd.c (modified) (5 diffs)
• console.c (modified) (2 diffs)
• kconsole.c (modified) (2 diffs)

kernel/generic/src/console/cmd.c

@@ -972 +972 @@
         sysarg_t (*fnc)(void);
         fncptr_t fptr;
-        int rc;
+        errno_t rc;
 
         symbol = (char *) argv->buffer;
@@ -1033 +1033 @@
         sysarg_t arg1 = argv[1].intval;
         fncptr_t fptr;
-        int rc;
+        errno_t rc;
 
         symbol = (char *) argv->buffer;
@@ -1070 +1070 @@
         sysarg_t arg2 = argv[2].intval;
         fncptr_t fptr;
-        int rc;
+        errno_t rc;
 
         symbol = (char *) argv->buffer;
@@ -1107 +1107 @@
         sysarg_t arg3 = argv[3].intval;
         fncptr_t fptr;
-        int rc;
+        errno_t rc;
         
         symbol = (char *) argv->buffer;
@@ -1182 +1182 @@
         uint32_t arg1 = argv[1].intval;
         bool pointer = false;
-        int rc;
+        errno_t rc;
         
         if (((char *) argv->buffer)[0] == '*') {

kernel/generic/src/console/console.c

@@ -391 +391 @@
  *
  */
-sysarg_t sys_kio(int cmd, const void *buf, size_t size)
+sys_errno_t sys_kio(int cmd, const void *buf, size_t size)
 {
         char *data;
-        int rc;
+        errno_t rc;
 
         switch (cmd) {
@@ -408 +408 @@
 
         if (size > PAGE_SIZE)
-                return (sysarg_t) ELIMIT;
+                return (sys_errno_t) ELIMIT;
         
         if (size > 0) {
                 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;

kernel/generic/src/console/kconsole.c

@@ -563 +563 @@
                 
                 uintptr_t symaddr;
-                int rc = symtab_addr_lookup(symname, &symaddr);
+                errno_t rc = symtab_addr_lookup(symname, &symaddr);
                 switch (rc) {
                 case ENOENT:
@@ -591 +591 @@
                 uint64_t value;
                 char *end;
-                int rc = str_uint64_t(text, &end, 0, false, &value);
+                errno_t rc = str_uint64_t(text, &end, 0, false, &value);
                 if (end != text + len)
                         rc = EINVAL;