From: Kay Sievers <kay@vrfy.org>
Date: Thu, 22 Nov 2012 17:47:25 +0000 (+0100)
Subject: timedatectl: shorten output to print single < 80 char line
X-Git-Tag: v197~222
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=324dfd5c321d71cdf0d861de88d9d573e7c7da06;p=elogind.git

timedatectl: shorten output to print single < 80 char line
---

diff --git a/src/timedate/timedatectl.c b/src/timedate/timedatectl.c
index c96377f82..8d8e12cb6 100644
--- a/src/timedate/timedatectl.c
+++ b/src/timedate/timedatectl.c
@@ -174,10 +174,10 @@ static void print_status_info(StatusInfo *i) {
                 zero(tm);
                 assert_se(strftime(b, sizeof(b), "%a, %Y-%m-%d %H:%M:%S %Z", localtime_r(&tc, &tm)) > 0);
                 char_array_0(b);
-                printf(" Last DST change: %s → %s, DST became %s\n"
+                printf(" Last DST change, DST became %s\n"
                        "                  %s\n"
                        "                  %s\n",
-                       strna(zn), strna(zc), is_dstc ? "active" : "inactive", a, b);
+                       is_dstc ? "active" : "inactive", a, b);
 
                 t = tn - 1;
                 zero(tm);
@@ -187,11 +187,10 @@ static void print_status_info(StatusInfo *i) {
                 zero(tm);
                 assert_se(strftime(b, sizeof(b), "%a, %Y-%m-%d %H:%M:%S %Z", localtime_r(&tn, &tm)) > 0);
                 char_array_0(b);
-                printf(" Next DST change: %s → %s, DST will become %s\n"
-                       "                  the clock will jump %s\n"
+                printf(" Next DST change, DST will become %s, the clock will jump %s\n"
                        "                  %s\n"
                        "                  %s\n",
-                       strna(zc), strna(zn), is_dstn ? "active" : "inactive", jump_str(dn, s, sizeof(s)), a, b);
+                       is_dstn ? "active" : "inactive", jump_str(dn, s, sizeof(s)), a, b);
 
                 free(zc);
                 free(zn);