Changes in uspace/lib/fmtutil/fmtutil.c [38d150e:1d6dd2a] in mainline

File:

• uspace/lib/fmtutil/fmtutil.c (modified) (7 diffs)

uspace/lib/fmtutil/fmtutil.c

@@ -31 +31 @@
 #include <fmtutil.h>
 #include <stdlib.h>
+#include <str.h>
 
 typedef struct {
@@ -38 +39 @@
 } 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 +47 @@
         }
         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 +64 @@
  *
  **/
-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 +84 @@
                 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 +170 @@
         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 +176 @@
                 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;