From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Sun, 15 Jan 2017 18:38:43 +0000 (-0500)
Subject: systemctl: fix alignment with units in not-found state
X-Git-Tag: v233~233^2~2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a9bd056ad9b3ac8c930a667842b16df97ba8fc97;p=thirdparty%2Fsystemd.git

systemctl: fix alignment with units in not-found state

A fixed value (6 and later 5) was added back in 4deb3b93911, and
not updated when load_len was added later on.

Also the other 5 with 1 + 1 + 1 + 1 + 1 to make it easier to see
that this is about the column separators.
---

diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c
index 9c0ee375202..41e8d6075a2 100644
--- a/src/systemctl/systemctl.c
+++ b/src/systemctl/systemctl.c
@@ -450,7 +450,7 @@ static int output_units_list(const UnitInfo *unit_infos, unsigned c) {
                 unsigned basic_len;
 
                 id_len = MIN(max_id_len, 25u); /* as much as it needs, but at most 25 for now */
-                basic_len = circle_len + 5 + id_len + 5 + active_len + sub_len;
+                basic_len = circle_len + 1 + id_len + 1 + load_len + 1 + active_len + 1 + sub_len + 1;
 
                 if (job_count)
                         basic_len += job_len + 1;