Changeset b7fd2a0 in mainline for uspace/lib/fmtutil/fmtutil.c

Timestamp:

2018-01-13T03:10:29Z (6 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/fmtutil/fmtutil.c (modified) (6 diffs)

uspace/lib/fmtutil/fmtutil.c

@@ -38 +38 @@
 } printmode_t;
 
-int print_wrapped_console(const char *str, align_mode_t alignment)
+errno_t print_wrapped_console(const char *str, align_mode_t alignment)
 {
         console_ctrl_t *console = console_init(stdin, stdout);
@@ -46 +46 @@
         }
         sysarg_t con_rows, con_cols, con_col, con_row;
-        int rc = console_get_size(console, &con_cols, &con_rows);
+        errno_t rc = console_get_size(console, &con_cols, &con_rows);
         if (rc != EOK) {
                 return rc;
@@ -63 +63 @@
  *
  **/
-static int print_line(wchar_t *wstr, size_t chars, bool last, void *data)
+static errno_t print_line(wchar_t *wstr, size_t chars, bool last, void *data)
 {
         printmode_t *pm = (printmode_t *) data;
         wchar_t old_char = wstr[chars];
         wstr[chars] = 0;
-        int rc = print_aligned_w(wstr, pm->width, last, pm->alignment);
+        errno_t rc = print_aligned_w(wstr, pm->width, last, pm->alignment);
         wstr[chars] = old_char;
         return rc;
 }
 
-int print_wrapped(const char *str, size_t width, align_mode_t mode)
+errno_t print_wrapped(const char *str, size_t width, align_mode_t mode)
 {
         printmode_t pm;
@@ -83 +83 @@
                 return ENOMEM;
         }
-        int rc = wrap(wstr, width, print_line, &pm);
+        errno_t rc = wrap(wstr, width, print_line, &pm);
         free(wstr);
         return rc;
 }
 
-int print_aligned_w(const wchar_t *wstr, size_t width, bool last,
+errno_t print_aligned_w(const wchar_t *wstr, size_t width, bool last,
     align_mode_t mode)
 {
@@ -169 +169 @@
         return EOK;
 }
-int print_aligned(const char *str, size_t width, bool last, align_mode_t mode)
+errno_t print_aligned(const char *str, size_t width, bool last, align_mode_t mode)
 {
         wchar_t *wstr = str_to_awstr(str);
@@ -175 +175 @@
                 return ENOMEM;
         }
-        int rc = print_aligned_w(wstr, width, last, mode);
+        errno_t rc = print_aligned_w(wstr, width, last, mode);
         free(wstr);
         return rc;
 }
 
-int wrap(wchar_t *wstr, size_t width, line_consumer_fn consumer, void *data)
+errno_t wrap(wchar_t *wstr, size_t width, line_consumer_fn consumer, void *data)
 {
         size_t word_start = 0;