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