X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Ftimedate%2Ftimedatectl.c;h=0664f6975da346767d73966f0497e98c9d1662e4;hb=2ad7561f9f658f8dee168a76654c7d918e2260c7;hp=2c24b78458b367da5c0318f88be2c04129d108e7;hpb=9ff09bcb86fb125768667aca9bc0b10b1745370a;p=elogind.git

diff --git a/src/timedate/timedatectl.c b/src/timedate/timedatectl.c
index 2c24b7845..0664f6975 100644
--- a/src/timedate/timedatectl.c
+++ b/src/timedate/timedatectl.c
@@ -99,17 +99,17 @@ static void print_status_info(const StatusInfo *i) {
         struct tm tm;
         time_t sec;
         bool have_time = false;
-        char *zc, *zn;
+        _cleanup_free_ char *zc = NULL, *zn = NULL;
         time_t t, tc, tn;
-        int dn;
-        bool is_dstc, is_dstn;
+        int dn = 0;
+        bool is_dstc = false, is_dstn = false;
         int r;
 
         assert(i);
 
         /* Enforce the values of /etc/localtime */
         if (getenv("TZ")) {
-                fprintf(stderr, "Warning: ignoring the TZ variable, reading the system's timezone setting only.\n\n");
+                fprintf(stderr, "Warning: Ignoring the TZ variable. Reading the system's time zone setting only.\n\n");
                 unsetenv("TZ");
         }
 
@@ -120,7 +120,7 @@ static void print_status_info(const StatusInfo *i) {
                 sec = time(NULL);
                 have_time = true;
         } else
-                fprintf(stderr, "Warning: could not get time from timedated and not operating locally.\n\n");
+                fprintf(stderr, "Warning: Could not get time from timedated and not operating locally.\n\n");
 
         if (have_time) {
                 zero(tm);
@@ -151,7 +151,7 @@ static void print_status_info(const StatusInfo *i) {
         zero(tm);
         assert_se(strftime(a, sizeof(a), "%Z, %z", localtime_r(&sec, &tm)) > 0);
         char_array_0(a);
-        printf("        Timezone: %s (%s)\n"
+        printf("       Time zone: %s (%s)\n"
                "     NTP enabled: %s\n"
                "NTP synchronized: %s\n"
                " RTC in local TZ: %s\n",
@@ -193,18 +193,15 @@ static void print_status_info(const StatusInfo *i) {
                        "                  %s\n"
                        "                  %s\n",
                        is_dstn ? "begins" : "ends", jump_str(dn, s, sizeof(s)), a, b);
-
-                free(zc);
-                free(zn);
         } else
                 printf("      DST active: %s\n", yes_no(is_dstc));
 
         if (i->rtc_local)
                 fputs("\n" ANSI_HIGHLIGHT_ON
-                      "Warning: The RTC is configured to maintain time in the local timezone. This\n"
+                      "Warning: The RTC is configured to maintain time in the local time zone. This\n"
                       "         mode is not fully supported and will create various problems with time\n"
-                      "         zone changes and daylight saving adjustments. If at all possible use\n"
-                      "         RTC in UTC, by calling 'timedatectl set-local-rtc 0'" ANSI_HIGHLIGHT_OFF ".\n", stdout);
+                      "         zone changes and daylight saving time adjustments. If at all possible, use\n"
+                      "         RTC in UTC by calling 'timedatectl set-local-rtc 0'" ANSI_HIGHLIGHT_OFF ".\n", stdout);
 }
 
 static int show_status(sd_bus *bus, char **args, unsigned n) {
@@ -289,7 +286,7 @@ static int set_timezone(sd_bus *bus, char **args, unsigned n) {
                                NULL,
                                "sb", args[1], arg_ask_password);
         if (r < 0)
-                log_error("Failed to set timezone: %s", bus_error_message(&error, -r));
+                log_error("Failed to set time zone: %s", bus_error_message(&error, -r));
 
         return r;
 }
@@ -362,7 +359,7 @@ static int list_timezones(sd_bus *bus, char **args, unsigned n) {
 
         f = fopen("/usr/share/zoneinfo/zone.tab", "re");
         if (!f) {
-                log_error("Failed to open timezone database: %m");
+                log_error("Failed to open time zone database: %m");
                 return -errno;
         }
 
@@ -374,7 +371,7 @@ static int list_timezones(sd_bus *bus, char **args, unsigned n) {
                         if (feof(f))
                                 break;
 
-                        log_error("Failed to read timezone database: %m");
+                        log_error("Failed to read time zone database: %m");
                         return -errno;
                 }
 
@@ -383,7 +380,6 @@ static int list_timezones(sd_bus *bus, char **args, unsigned n) {
                 if (isempty(p) || *p == '#')
                         continue;
 
-
                 /* Skip over country code */
                 p += strcspn(p, WHITESPACE);
                 p += strspn(p, WHITESPACE);
@@ -426,7 +422,7 @@ static int help(void) {
 
         printf("%s [OPTIONS...] COMMAND ...\n\n"
                "Query or change system time and date settings.\n\n"
-               "  -h --help                Show this help\n"
+               "  -h --help                Show this help message\n"
                "     --version             Show package version\n"
                "     --no-pager            Do not pipe output into a pager\n"
                "     --no-ask-password     Do not prompt for password\n"
@@ -436,8 +432,8 @@ static int help(void) {
                "Commands:\n"
                "  status                   Show current time settings\n"
                "  set-time TIME            Set system time\n"
-               "  set-timezone ZONE        Set system timezone\n"
-               "  list-timezones           Show known timezones\n"
+               "  set-timezone ZONE        Set system time zone\n"
+               "  list-timezones           Show known time zones\n"
                "  set-local-rtc BOOL       Control whether RTC is in local time\n"
                "  set-ntp BOOL             Control whether NTP is enabled\n",
                program_invocation_short_name);