summaryrefslogtreecommitdiff
path: root/timezone/zdump.c
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2005-04-04 20:47:29 +0000
committerUlrich Drepper <drepper@redhat.com>2005-04-04 20:47:29 +0000
commit7a50b1f6d1bd959ae5dfb5539d9cd8935eb8d926 (patch)
tree9b8a04127df288b73c3cec99474832a286acd96c /timezone/zdump.c
parent91682d7038c0247ba1a52925b284fcb59756546e (diff)
* sunrpc/pmap_rmt.c (xdr_rmtcall_args): Use a dummy arglen instead
of trying to encode uninitialized arglen. 2005-04-04 Ulrich Drepper <drepper@redhat.com> * timezone/scheck.c: Update from tzcode2005h. * timezone/tzfile.h: Likewise. * timezone/zdump.c: Likewise. * timezone/zic.c: Likewise. * timezone/antarctica: Update from tzdata2005h. * timezone/asia: Likewise. * timezone/australasia: Likewise. * timezone/etcetera: Likewise. * timezone/europe: Likewise. * timezone/northamerica: Likewise. * timezone/southamerica: Likewise. * timezone/leapseconds: Likewise. * timezone/iso3166.tab: Likewise.
Diffstat (limited to 'timezone/zdump.c')
-rw-r--r--timezone/zdump.c17
1 files changed, 9 insertions, 8 deletions
diff --git a/timezone/zdump.c b/timezone/zdump.c
index bd7132698f..2fcce38c06 100644
--- a/timezone/zdump.c
+++ b/timezone/zdump.c
@@ -1,4 +1,4 @@
-static char elsieid[] = "@(#)zdump.c 7.61";
+static char elsieid[] = "@(#)zdump.c 7.64";
/*
** This code has been made independent of the rest of the time
@@ -175,12 +175,13 @@ time_t * tp;
(void) fprintf(stderr, "\n%s: ", progname);
(void) fprintf(stderr, tformat(), *tp);
(void) fprintf(stderr, " ->");
- (void) fprintf(stderr, " sec %d", tmp->tm_sec);
- (void) fprintf(stderr, " min %d", tmp->tm_min);
- (void) fprintf(stderr, " hour %d", tmp->tm_hour);
- (void) fprintf(stderr, " mday %d", tmp->tm_mday);
- (void) fprintf(stderr, " mon %d", tmp->tm_mon);
- (void) fprintf(stderr, " year %d", tmp->tm_year);
+ (void) fprintf(stderr, " year=%d", tmp->tm_year);
+ (void) fprintf(stderr, " mon=%d", tmp->tm_mon);
+ (void) fprintf(stderr, " mday=%d", tmp->tm_mday);
+ (void) fprintf(stderr, " hour=%d", tmp->tm_hour);
+ (void) fprintf(stderr, " min=%d", tmp->tm_min);
+ (void) fprintf(stderr, " sec=%d", tmp->tm_sec);
+ (void) fprintf(stderr, " isdst=%d", tmp->tm_isdst);
(void) fprintf(stderr, " -> ");
(void) fprintf(stderr, tformat(), t);
(void) fprintf(stderr, "\n");
@@ -318,7 +319,7 @@ _("%s: usage is %s [ --version ] [ -v ] [ -c [loyear,]hiyear ] zonename ...\n"),
newtmp = localtime(&newt);
if (newtmp != NULL)
newtm = *newtmp;
- if ((tmp == NULL || newtmp == NULL) ? (tmp != newtmp) :
+ if ((tmp == NULL || newtmp == NULL) ? (tmp != newtmp) :
(delta(&newtm, &tm) != (newt - t) ||
newtm.tm_isdst != tm.tm_isdst ||
strcmp(abbr(&newtm), buf) != 0)) {