Avoid trailing separator in reports when there are hidden sort fields.

1 files changed, 9 insertions, 1 deletions

diff --git a/libdm/libdm-report.c b/libdm/libdm-report.c
index 1423872c..1bff8385 100644
--- a/libdm/libdm-report.c
+++ b/libdm/libdm-report.c
@@ -316,7 +316,15 @@ static struct field_properties * _add_field(struct dm_report *rh,
 	}
 
 	fp->flags |= flags;
-	list_add(&rh->field_props, &fp->list);
+
+	/*
+	 * Place hidden fields at the front so list_end() will
+	 * tell us when we've reached the last visible field.
+	 */
+	if (fp->flags & FLD_HIDDEN)
+		list_add_h(&rh->field_props, &fp->list);
+	else
+		list_add(&rh->field_props, &fp->list);
 
 	return fp;
 }