Changes in uspace/lib/c/generic/io/table.c [11d9630:1d6dd2a] in mainline

File:

• uspace/lib/c/generic/io/table.c (modified) (12 diffs)

uspace/lib/c/generic/io/table.c

@@ -40 +40 @@
 #include <stdio.h>
 #include <stdlib.h>
+#include <str.h>
 
 static table_column_t *table_column_first(table_t *);
@@ -51 +52 @@
  * @return EOK on success, ENOMEM if out of memory
  */
-static int table_add_row(table_t *table, table_row_t **rrow)
+static errno_t table_add_row(table_t *table, table_row_t **rrow)
 {
         table_row_t *row;
@@ -74 +75 @@
  * @return EOK on success, ENOMEM if out of memory
  */
-static int table_row_add_cell(table_row_t *row, table_cell_t **rcell)
+static errno_t table_row_add_cell(table_row_t *row, table_cell_t **rcell)
 {
         table_cell_t *cell;
@@ -99 +100 @@
  * @return EOK on success, ENOMEM if out of memory
  */
-static int table_add_column(table_t *table, table_column_t **rcolumn)
+static errno_t table_add_column(table_t *table, table_column_t **rcolumn)
 {
         table_column_t *column;
@@ -121 +122 @@
  * @return EOK on success, ENOMEM if out of memory
  */
-static int table_write_next_cell(table_t *table)
-{
-        int rc;
+static errno_t table_write_next_cell(table_t *table)
+{
+        errno_t rc;
 
         rc = table_row_add_cell(table->wrow, &table->wcell);
@@ -155 +156 @@
  * @return EOK on success, ENOMEM if out of memory
  */
-static int table_write_next_row(table_t *table)
-{
-        int rc;
+static errno_t table_write_next_row(table_t *table)
+{
+        errno_t rc;
 
         rc = table_add_row(table, &table->wrow);
@@ -272 +273 @@
  * @return EOK on success, ENOMEM if out of memory
  */
-static int table_cell_extend(table_cell_t *cell, const char *str, size_t len)
+static errno_t table_cell_extend(table_cell_t *cell, const char *str, size_t len)
 {
         char *cstr;
@@ -298 +299 @@
  * @return EOK on success, ENOMEM if out of memory
  */
-int table_create(table_t **rtable)
+errno_t table_create(table_t **rtable)
 {
         table_t *table;
-        int rc;
+        errno_t rc;
 
         table = calloc(1, sizeof(table_t));
@@ -377 +378 @@
  * @return EOK on success, EIO on I/O error
  */
-int table_print_out(table_t *table, FILE *f)
+errno_t table_print_out(table_t *table, FILE *f)
 {
         table_row_t *row;
@@ -474 +475 @@
  * @return EOK on success, ENOMEM if out of memory
  */
-int table_printf(table_t *table, const char *fmt, ...)
+errno_t table_printf(table_t *table, const char *fmt, ...)
 {
         va_list args;
-        int rc;
+        errno_t rc;
+        int ret;
         char *str;
         char *sp, *ep;
@@ -486 +488 @@
 
         va_start(args, fmt);
-        rc = vasprintf(&str, fmt, args);
+        ret = vasprintf(&str, fmt, args);
         va_end(args);
 
-        if (rc < 0) {
+        if (ret < 0) {
                 table->error = ENOMEM;
                 return table->error;
@@ -547 +549 @@
  * @return EOK if no error indicated, non-zero error code otherwise
  */
-int table_get_error(table_t *table)
+errno_t table_get_error(table_t *table)
 {
         return table->error;