diff options
| author | edwin <edwin@FreeBSD.org> | 2009-11-02 23:02:11 +0000 |
|---|---|---|
| committer | edwin <edwin@FreeBSD.org> | 2009-11-02 23:02:11 +0000 |
| commit | 2b4e180195840f8f7f0d928c372ca7e02779cdf5 (patch) | |
| tree | 214b587ab4da95a523839773499dba37a9005e86 /usr.sbin/zic | |
| parent | bee6d1c9533112e3e0fb5ae0c78d1afbea98fec3 (diff) | |
| download | FreeBSD-src-2b4e180195840f8f7f0d928c372ca7e02779cdf5.zip FreeBSD-src-2b4e180195840f8f7f0d928c372ca7e02779cdf5.tar.gz | |
MFV of r198828, tzcode2009q
- Cleanup unnecessary local variables in zdump.
- Fix man-page
MFC after: 1 week
Diffstat (limited to 'usr.sbin/zic')
| -rw-r--r-- | usr.sbin/zic/zdump.c | 10 | ||||
| -rw-r--r-- | usr.sbin/zic/zic.8 | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/usr.sbin/zic/zdump.c b/usr.sbin/zic/zdump.c index 263a592..0f61125 100644 --- a/usr.sbin/zic/zdump.c +++ b/usr.sbin/zic/zdump.c @@ -6,7 +6,7 @@ #ifndef lint static const char rcsid[] = "$FreeBSD$"; -static char elsieid[] = "@(#)zdump.c 8.9"; +static char elsieid[] = "@(#)zdump.c 8.10"; #endif /* not lint */ /* @@ -152,7 +152,7 @@ static size_t longest; static char * progname; static int warned; -static void usage(const char *progname, FILE *stream, int status); +static void usage(FILE *stream, int status); static char * abbr(struct tm * tmp); static void abbrok(const char * abbrp, const char * zone); static long delta(struct tm * newp, struct tm * oldp); @@ -273,7 +273,7 @@ char * argv[]; if (strcmp(argv[i], "--version") == 0) { errx(EXIT_SUCCESS, "%s", elsieid); } else if (strcmp(argv[i], "--help") == 0) { - usage(progname, stdout, EXIT_SUCCESS); + usage(stdout, EXIT_SUCCESS); } vflag = 0; cutarg = NULL; @@ -283,7 +283,7 @@ char * argv[]; else cutarg = optarg; if ((c != -1) || (optind == argc - 1 && strcmp(argv[optind], "=") == 0)) { - usage(progname, stderr, EXIT_FAILURE); + usage(stderr, EXIT_FAILURE); } if (vflag) { if (cutarg != NULL) { @@ -468,7 +468,7 @@ const long y; } static void -usage(const char *progname, FILE *stream, int status) +usage(FILE *stream, int status) { fprintf(stream, _("usage: %s [--version] [-v] [--help] [-c [loyear,]hiyear] zonename ...\n\ diff --git a/usr.sbin/zic/zic.8 b/usr.sbin/zic/zic.8 index 082ff25..f7ff815b 100644 --- a/usr.sbin/zic/zic.8 +++ b/usr.sbin/zic/zic.8 @@ -260,7 +260,7 @@ the variable part is null. .El .Pp A zone line has the form: -.Dl "Zone NAME GMTOFF RULES/SAVE FORMAT [UNTILYEAR [MONTH [DAY [TIME]]]] +.Dl "Zone NAME GMTOFF RULES/SAVE FORMAT [UNTILYEAR [MONTH [DAY [TIME]]]]" For example: .Dl "Zone Australia/Adelaide 9:30 Aus CST 1971 Oct 31 2:00 The fields that make up a zone line are: |
