X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=ovsdb%2Fovsdb-client.c;h=da7faf61aa18b95451ff8e2c8b5848a3a61ed7a6;hb=c6278d208924bb04c41266ddca276712f95533bc;hp=e6dee819e2bb08296d56f6a248ab6c1bd24f87d7;hpb=25c269efadb6a7f7f00d8a1ee66104041481299d;p=openvswitch diff --git a/ovsdb/ovsdb-client.c b/ovsdb/ovsdb-client.c index e6dee819..da7faf61 100644 --- a/ovsdb/ovsdb-client.c +++ b/ovsdb/ovsdb-client.c @@ -434,9 +434,14 @@ table_print_table_line__(struct ds *line) static void table_print_table__(const struct table *table) { + static int n = 0; struct ds line = DS_EMPTY_INITIALIZER; size_t x, y; + if (n++ > 0) { + putchar('\n'); + } + if (output_headings) { for (x = 0; x < table->n_columns; x++) { const struct column *column = &table->columns[x]; @@ -590,8 +595,13 @@ table_print_csv_cell__(const char *content) static void table_print_csv__(const struct table *table) { + static int n = 0; size_t x, y; + if (n++ > 0) { + putchar('\n'); + } + if (table->caption) { puts(table->caption); } @@ -685,15 +695,11 @@ do_list_tables(int argc OVS_UNUSED, char *argv[]) schema = fetch_schema(argv[1], argv[2]); table_init(&t); table_add_column(&t, "Table"); - table_add_column(&t, "Comment"); SHASH_FOR_EACH (node, &schema->tables) { struct ovsdb_table_schema *ts = node->data; table_add_row(&t); table_add_cell(&t, ts->name); - if (ts->comment) { - table_add_cell(&t, ts->comment); - } } ovsdb_schema_destroy(schema); table_print(&t); @@ -714,7 +720,6 @@ do_list_columns(int argc OVS_UNUSED, char *argv[]) } table_add_column(&t, "Column"); table_add_column(&t, "Type"); - table_add_column(&t, "Comment"); SHASH_FOR_EACH (table_node, &schema->tables) { struct ovsdb_table_schema *ts = table_node->data; @@ -731,9 +736,6 @@ do_list_columns(int argc OVS_UNUSED, char *argv[]) } table_add_cell(&t, column->name); table_add_cell_nocopy(&t, json_to_string(type, JSSF_SORT)); - if (column->comment) { - table_add_cell(&t, column->comment); - } json_destroy(type); }