Changeset 207d5da in mainline

Timestamp:

2017-09-22T07:21:53Z (7 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

5c769d54

Parents:

5e962ad

Message:

Fix extraneous empty line printed after table.

Location:

uspace

Files:

• app/inet/inet.c (modified) (3 diffs)
• lib/c/generic/io/table.c (modified) (3 diffs)

uspace/app/inet/inet.c

@@ -319 +319 @@
         }
 
+        printf("\n");
+
         rc = EOK;
 out:
@@ -392 +394 @@
         }
 
+        printf("\n");
+
         rc = EOK;
 out:
@@ -476 +480 @@
                 }
         }
+
+        printf("\n");
 
         rc = EOK;

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

@@ -165 +165 @@
         }
 
-        return table_write_next_cell(table);
+        table->wcell = NULL;
+        return EOK;
 }
 
@@ -394 +395 @@
         while (row != NULL) {
                 cell = table_row_cell_first(row);
+                if (cell == NULL)
+                        break;
+
                 column = table_column_first(table);
                 firstc = true;
+
                 while (cell != NULL && cell->text != NULL) {
                         spacing = firstc ? table->metrics.margin_left : 1;
@@ -495 +500 @@
                         ++ep;
 
+                if (table->wcell == NULL) {
+                        rc = table_write_next_cell(table);
+                        if (rc != EOK) {
+                                assert(rc == ENOMEM);
+                                goto out;
+                        }
+                }
+
                 rc = table_cell_extend(table->wcell, sp, ep - sp);
                 if (rc != EOK) {