oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

(rtbl_format): avoid printing an empty row at the end

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@8721 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Assar Westerlund
2000-07-20 14:42:31 +00:00
parent 942d1d99b8
commit fee07cb8ef
1 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
lib/roken/rtbl.c
View File

@@ -195,7 +195,6 @@ rtbl_format (rtbl_t table, FILE * f)
{ {
int i, j; int i, j;
for (i = 0; i < table->num_columns; i++) for (i = 0; i < table->num_columns; i++)
column_compute_width (table->columns[i]); column_compute_width (table->columns[i]);
for (i = 0; i < table->num_columns; i++) { for (i = 0; i < table->num_columns; i++) {
@@ -209,6 +208,17 @@ rtbl_format (rtbl_t table, FILE * f)
for (j = 0;; j++) { for (j = 0;; j++) {
int flag = 0; int flag = 0;
for (i = 0; flag == 0 && i < table->num_columns; ++i) {
struct column_data *c = table->columns[i];
if (c->num_rows > j) {
++flag;
break;
}
}
if (flag == 0)
break;
for (i = 0; i < table->num_columns; i++) { for (i = 0; i < table->num_columns; i++) {
int w; int w;
struct column_data *c = table->columns[i]; struct column_data *c = table->columns[i];
@@ -220,13 +230,9 @@ rtbl_format (rtbl_t table, FILE * f)
fprintf (f, "%s", get_column_prefix (table, c)); fprintf (f, "%s", get_column_prefix (table, c));
if (c->num_rows <= j) if (c->num_rows <= j)
fprintf (f, "%*s", w, ""); fprintf (f, "%*s", w, "");
else { else
fprintf (f, "%*s", w, c->rows[j].data); fprintf (f, "%*s", w, c->rows[j].data);
flag++;
}
} }
if (flag == 0)
break;
fprintf (f, "\n"); fprintf (f, "\n");
} }
return 0; return 0;