diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2023-06-22 13:44:50 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2023-06-22 13:49:09 -0700 |
| commit | 21fbc0a19366f89638a30eef2b53c6d4baafdb88 (patch) | |
| tree | 72d20654a70d7b7b953791bcffd24f1c6a025901 /time | |
| parent | 99f9ae4ed0ba9f2c84520b78fd0eeed96a7ed40e (diff) | |
| download | glibc-21fbc0a19366f89638a30eef2b53c6d4baafdb88.tar.gz glibc-21fbc0a19366f89638a30eef2b53c6d4baafdb88.tar.xz glibc-21fbc0a19366f89638a30eef2b53c6d4baafdb88.zip | |
Call "CST" a time zone abbreviation, not a name
In documentation, call strings like "CST" time zone abbreviations, not time zone names. This terminology is more precise, and is what tzdb uses. A string like "CST" is ambiguous and does not fully name a time zone.
Diffstat (limited to 'time')
| -rw-r--r-- | time/mktime.c | 2 | ||||
| -rw-r--r-- | time/time.h | 2 | ||||
| -rw-r--r-- | time/tzfile.c | 4 | ||||
| -rw-r--r-- | time/tzset.c | 6 |
4 files changed, 7 insertions, 7 deletions
diff --git a/time/mktime.c b/time/mktime.c index 94a4320e6c..a73474e7ee 100644 --- a/time/mktime.c +++ b/time/mktime.c @@ -536,7 +536,7 @@ __time64_t __mktime64 (struct tm *tp) { /* POSIX.1 8.1.1 requires that whenever mktime() is called, the - time zone names contained in the external variable 'tzname' shall + time zone abbreviations contained in the external variable 'tzname' shall be set as if the tzset() function had been called. */ __tzset (); diff --git a/time/time.h b/time/time.h index 368f4dc588..859d966822 100644 --- a/time/time.h +++ b/time/time.h @@ -215,7 +215,7 @@ extern char *__REDIRECT_NTH (ctime_r, (const time_t *__restrict __timer, /* Defined in localtime.c. */ -extern char *__tzname[2]; /* Current timezone names. */ +extern char *__tzname[2]; /* Current time zone abbreviations. */ extern int __daylight; /* If daylight-saving time is ever in use. */ extern long int __timezone; /* Seconds west of UTC. */ diff --git a/time/tzfile.c b/time/tzfile.c index a267eb652e..8a923d0ccc 100644 --- a/time/tzfile.c +++ b/time/tzfile.c @@ -408,7 +408,7 @@ __tzfile_read (const char *file, size_t extra, char **extrap) fclose (f); - /* First "register" all timezone names. */ + /* First "register" all time zone abbreviations. */ for (i = 0; i < num_types; ++i) if (__tzstring (&zone_names[types[i].idx]) == NULL) goto ret_free_transitions; @@ -565,7 +565,7 @@ __tzfile_default (const char *std, const char *dst, types[1].offset = dstoff; types[1].isdst = 1; - /* Reset the zone names to point to the user's names. */ + /* Reset time zone abbreviations to point to the user's abbreviations. */ __tzname[0] = (char *) std; __tzname[1] = (char *) dst; diff --git a/time/tzset.c b/time/tzset.c index 8c740a4e4d..78c18f8147 100644 --- a/time/tzset.c +++ b/time/tzset.c @@ -145,7 +145,7 @@ compute_offset (unsigned int ss, unsigned int mm, unsigned int hh) return ss + mm * 60 + hh * 60 * 60; } -/* Parses the time zone name at *TZP, and writes a pointer to an +/* Parses the time zone abbreviation at *TZP, and writes a pointer to an interned string to tz_rules[WHICHRULE].name. On success, advances *TZP, and returns true. Returns false otherwise. */ static bool @@ -324,10 +324,10 @@ __tzset_parse_tz (const char *tz) memset (tz_rules, '\0', sizeof tz_rules); tz_rules[0].name = tz_rules[1].name = ""; - /* Get the standard timezone name. */ + /* Get the standard time zone abbreviations. */ if (parse_tzname (&tz, 0) && parse_offset (&tz, 0)) { - /* Get the DST timezone name (if any). */ + /* Get the DST time zone abbreviation (if any). */ if (*tz != '\0') { if (parse_tzname (&tz, 1)) |