timedatectl: shorten output to print single < 80 char line

diff --git a/src/timedate/timedatectl.c b/src/timedate/timedatectl.c
index c96377f829d0e948b3af733621ddf688e318dac3..8d8e12cb6b691021525b9748bb0a57314536f120 100644 (file)
--- 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);
                 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",
                        "                  %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);
 
                 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);
                 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",
                        "                  %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);
 
                 free(zc);
                 free(zn);