From owner-svn-src-head@freebsd.org Sun Mar 29 04:18:36 2020 Return-Path: Delivered-To: svn-src-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id B32ED271E09; Sun, 29 Mar 2020 04:18:36 +0000 (UTC) (envelope-from grog@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48qj572CRyz4dJq; Sun, 29 Mar 2020 04:18:35 +0000 (UTC) (envelope-from grog@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 3DC862189A; Sun, 29 Mar 2020 04:18:28 +0000 (UTC) (envelope-from grog@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 02T4IRVI003293; Sun, 29 Mar 2020 04:18:27 GMT (envelope-from grog@FreeBSD.org) Received: (from grog@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 02T4IR46003292; Sun, 29 Mar 2020 04:18:27 GMT (envelope-from grog@FreeBSD.org) Message-Id: <202003290418.02T4IR46003292@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: grog set sender to grog@FreeBSD.org using -f From: Greg Lehey Date: Sun, 29 Mar 2020 04:18:27 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r359419 - head/usr.bin/ncal X-SVN-Group: head X-SVN-Commit-Author: grog X-SVN-Commit-Paths: head/usr.bin/ncal X-SVN-Commit-Revision: 359419 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 29 Mar 2020 04:18:36 -0000 Author: grog Date: Sun Mar 29 04:18:27 2020 New Revision: 359419 URL: https://svnweb.freebsd.org/changeset/base/359419 Log: Remove spurious transition from Julian to Gregorian for country "Latin". Arguably the entire -p option should be removed. It shows only a few countries, and it doesn't have any relationship with the rest of the program. PR: 244801 Submitted by: grog@ Reported by: Hamid Ali Modified: head/usr.bin/ncal/ncal.c Modified: head/usr.bin/ncal/ncal.c ============================================================================== --- head/usr.bin/ncal/ncal.c Sun Mar 29 04:14:57 2020 (r359418) +++ head/usr.bin/ncal/ncal.c Sun Mar 29 04:18:27 2020 (r359419) @@ -95,7 +95,6 @@ static struct djswitch { {"IT", "Italy", {1582, 10, 4}}, {"JP", "Japan", {1918, 12, 18}}, {"LI", "Lithuania", {1918, 2, 1}}, - {"LN", "Latin", {9999, 05, 31}}, {"LU", "Luxembourg", {1582, 12, 14}}, {"LV", "Latvia", {1918, 2, 1}}, {"NL", "Netherlands", {1582, 12, 14}}, @@ -580,7 +579,7 @@ printeaster(int y, int julian, int orthodox) (y)++; \ } #define M2Y(m) ((m) / 12) -#define M2M(m) (1 + (m) % 12) +#define M2M(m) (1 + (m) % 12) /* Print all months for the period in the range [ before .. y-m .. after ]. */ static void @@ -925,7 +924,7 @@ mkmonthb(int y, int m, int jd_flag, struct monthlines for (i = 0; i != 6; i++) { l = 0; for (j = firsts + 7 * i, k = 0; j < last && k != dw * 7; - j++, k += dw) { + j++, k += dw) { if (j >= first) { if (jd_flag) dt.d = j - jan1 + 1;