Author: edwin
Date: Mon Nov 9 11:32:34 2009
New Revision: 199078
URL: http://svn.freebsd.org/changeset/base/199078
Log:
MFC of 198831, tzcode2009q
- Cleanup unnecessary local variables in zdump.
- Fix man-page
Modified:
stable/7/usr.sbin/zic/zdump.c
stable/7/usr.sbin/zic/zic.8
Directory Properties:
stable/7/usr.sbin/zic/ (props changed)
Modified: stable/7/usr.sbin/zic/zdump.c
==============================================================================
--- stable/7/usr.sbin/zic/zdump.c Mon Nov 9 11:32:18 2009
(r199077)
+++ stable/7/usr.sbin/zic/zdump.c Mon Nov 9 11:32:34 2009
(r199078)
@@ -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 != EOF && 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\
Modified: stable/7/usr.sbin/zic/zic.8
==============================================================================
--- stable/7/usr.sbin/zic/zic.8 Mon Nov 9 11:32:18 2009 (r199077)
+++ stable/7/usr.sbin/zic/zic.8 Mon Nov 9 11:32:34 2009 (r199078)
@@ -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:
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
