diff options
| author | Ulrich Drepper <drepper@redhat.com> | 1999-01-19 14:38:48 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 1999-01-19 14:38:48 +0000 |
| commit | 3ef4002b3ff17002a45627c45d62eace9d84b958 (patch) | |
| tree | fa951e98f5b148717f4958192480ce0ce7193633 /timezone | |
| parent | 42bd0a85b94af5f2a2246fb0ed56b73a652453d6 (diff) | |
| download | glibc-3ef4002b3ff17002a45627c45d62eace9d84b958.tar glibc-3ef4002b3ff17002a45627c45d62eace9d84b958.tar.gz glibc-3ef4002b3ff17002a45627c45d62eace9d84b958.tar.bz2 glibc-3ef4002b3ff17002a45627c45d62eace9d84b958.zip | |
Update.
1999-01-19 Ulrich Drepper <drepper@cygnus.com>
* timezone/zdump.c: Update from tzcode1999a.
* timezone/zic.c: Likewise.
Diffstat (limited to 'timezone')
| -rw-r--r-- | timezone/zdump.c | 16 | ||||
| -rw-r--r-- | timezone/zic.c | 6 |
2 files changed, 9 insertions, 13 deletions
diff --git a/timezone/zdump.c b/timezone/zdump.c index 8c4f6ad1df..094e17251a 100644 --- a/timezone/zdump.c +++ b/timezone/zdump.c @@ -1,6 +1,6 @@ #ifndef lint #ifndef NOID -static char elsieid[] = "@(#)zdump.c 7.27"; +static char elsieid[] = "@(#)zdump.c 7.28"; #endif /* !defined NOID */ #endif /* !defined lint */ @@ -127,7 +127,7 @@ extern char * optarg; extern int optind; extern char * tzname[2]; -static const char *abbr P((struct tm * tmp)); +static char * abbr P((struct tm * tmp)); static long delta P((struct tm * newp, struct tm * oldp)); static time_t hunt P((char * name, time_t lot, time_t hit)); static size_t longest; @@ -263,7 +263,7 @@ _("%s: usage is %s [ -v ] [ -c cutoff ] zonename ...\n"), show(argv[i], t, TRUE); } if (fflush(stdout) || ferror(stdout)) { - (void) fprintf(stderr, _("%s: Error writing standard output "), + (void) fprintf(stderr, _("%s: Error writing "), argv[0]); (void) perror(_("standard output")); (void) exit(EXIT_FAILURE); @@ -358,19 +358,15 @@ int v; (void) printf("\n"); } -static const char * +static char * abbr(tmp) struct tm * tmp; { - register const char *result; - static const char nada; + register char * result; + static char nada; -#ifdef TM_ZONE - result = tmp->TM_ZONE; -#else /* !defined TM_ZONE */ if (tmp->tm_isdst != 0 && tmp->tm_isdst != 1) return &nada; result = tzname[tmp->tm_isdst]; -#endif /* !defined TM_ZONE */ return (result == NULL) ? &nada : result; } diff --git a/timezone/zic.c b/timezone/zic.c index b6b43c7c17..040a6053d2 100644 --- a/timezone/zic.c +++ b/timezone/zic.c @@ -1,6 +1,6 @@ #ifndef lint #ifndef NOID -static char elsieid[] = "@(#)zic.c 7.95"; +static char elsieid[] = "@(#)zic.c 7.96"; #endif /* !defined NOID */ #endif /* !defined lint */ @@ -381,7 +381,7 @@ int errnum; extern int sys_nerr; return (errnum > 0 && errnum <= sys_nerr) ? - sys_errlist[errnum] : "Unknown system error"; + sys_errlist[errnum] : _("Unknown system error"); } #endif /* !(HAVE_STRERROR - 0) */ @@ -430,7 +430,7 @@ const char * const string; { char * cp; - cp = ecpyalloc("warning: "); + cp = ecpyalloc(_("warning: ")); cp = ecatalloc(cp, string); error(cp); ifree(cp); |