From owner-svn-src-stable-7@FreeBSD.ORG Mon Nov 9 11:32:35 2009 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1DCA11065719; Mon, 9 Nov 2009 11:32:35 +0000 (UTC) (envelope-from edwin@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id DA3AE8FC17; Mon, 9 Nov 2009 11:32:34 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id nA9BWYsB019690; Mon, 9 Nov 2009 11:32:34 GMT (envelope-from edwin@svn.freebsd.org) Received: (from edwin@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id nA9BWYdG019687; Mon, 9 Nov 2009 11:32:34 GMT (envelope-from edwin@svn.freebsd.org) Message-Id: <200911091132.nA9BWYdG019687@svn.freebsd.org> From: Edwin Groothuis Date: Mon, 9 Nov 2009 11:32:34 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r199078 - stable/7/usr.sbin/zic X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 09 Nov 2009 11:32:35 -0000 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: