From owner-svn-src-head@FreeBSD.ORG  Fri Feb 18 13:41:45 2011
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 7219D1065695;
	Fri, 18 Feb 2011 13:41:45 +0000 (UTC) (envelope-from osa@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 5DF4D8FC23;
	Fri, 18 Feb 2011 13:41:45 +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 p1IDfjFL059573;
	Fri, 18 Feb 2011 13:41:45 GMT (envelope-from osa@svn.freebsd.org)
Received: (from osa@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id p1IDfjEq059570;
	Fri, 18 Feb 2011 13:41:45 GMT (envelope-from osa@svn.freebsd.org)
Message-Id: <201102181341.p1IDfjEq059570@svn.freebsd.org>
From: "Sergey A. Osokin" <osa@FreeBSD.org>
Date: Fri, 18 Feb 2011 13:41:45 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r218797 - head/usr.bin/calendar
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 18 Feb 2011 13:41:45 -0000

Author: osa (ports committer)
Date: Fri Feb 18 13:41:45 2011
New Revision: 218797
URL: http://svn.freebsd.org/changeset/base/218797

Log:
  Replace hard-coded value by Julian2Gregorian converter function.

Modified:
  head/usr.bin/calendar/calendar.h
  head/usr.bin/calendar/paskha.c

Modified: head/usr.bin/calendar/calendar.h
==============================================================================
--- head/usr.bin/calendar/calendar.h	Fri Feb 18 13:21:30 2011	(r218796)
+++ head/usr.bin/calendar/calendar.h	Fri Feb 18 13:41:45 2011	(r218797)
@@ -170,6 +170,7 @@ FILE	*opencal(void);
 /* ostern.c / paskha.c */
 int	paskha(int);
 int	easter(int);
+int	j2g(int);
 
 /* dates.c */
 extern int cumdaytab[][14];

Modified: head/usr.bin/calendar/paskha.c
==============================================================================
--- head/usr.bin/calendar/paskha.c	Fri Feb 18 13:21:30 2011	(r218796)
+++ head/usr.bin/calendar/paskha.c	Fri Feb 18 13:41:45 2011	(r218797)
@@ -36,6 +36,15 @@ __FBSDID("$FreeBSD$");
 #define	PASKHA		"paskha"
 #define	PASKHALEN	(sizeof(PASKHA) - 1)
 
+/* return difference in days between Julian and Gregorian calendars */
+int
+j2g(int year)
+{
+	return (year < 1500) ?
+		0 :
+		10 + (year/100 - 16) - ((year/100 - 16) / 4);
+}
+
 /* return year day for Orthodox Easter using Gauss formula */
 /* (new style result) */
 
@@ -53,5 +62,5 @@ paskha(int R) /*year*/
 	d = (19 * a + x) % 30;
 	e = (2 * b + 4 * c + 6 * d + y) % 7;
 	cumday = cumdaytab[isleap(R)];
-	return (((cumday[3] + 1) + 22) + (d + e) + 13);
+	return (((cumday[3] + 1) + 22) + (d + e) + j2g(R));
 }