d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MFV of r198828, tzcode2009q

Browse Source 
- Cleanup unnecessary local variables in zdump.
- Fix man-page

MFC after:	1 week
This commit is contained in:
Edwin Groothuis 2009-11-02 23:02:11 +00:00
commit 1f72185627
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=198831
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
usr.sbin/zic/zdump.c
View File

@ -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\

2
usr.sbin/zic/zic.8
View File

@ -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: