Deleted Added
full compact
paskha.c (15714) paskha.c (15720)
1/*
2 * Copyright (C) 1993-1996 by Andrey A. Chernov, Moscow, Russia.
3 * All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

--- 12 unchanged lines hidden (view full) ---

21 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
22 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
23 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
24 * SUCH DAMAGE.
25 */
26
27#include <stdlib.h>
28#include <string.h>
1/*
2 * Copyright (C) 1993-1996 by Andrey A. Chernov, Moscow, Russia.
3 * All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

--- 12 unchanged lines hidden (view full) ---

21 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
22 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
23 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
24 * SUCH DAMAGE.
25 */
26
27#include <stdlib.h>
28#include <string.h>
29#include <stdio.h>
29
30
31#include "calendar.h"
32
30#define PASKHA "paskha"
31#define PASKHALEN (sizeof(PASKHA) - 1)
32
33#define PASKHA "paskha"
34#define PASKHALEN (sizeof(PASKHA) - 1)
35
33/* KOI8-R encoding, needed to fully handle Russian case */
34#define PASKHA1 "�����"
35#define PASKHALEN1 (sizeof(PASKHA1) - 1)
36
37extern int *cumdays;
38
39/* return year day for Orthodox Easter using Gauss formula */
40/* (old style result) */
41
42static int
43paskha (R)
44int R; /*year*/
45{
46 int a, b, c, d, e;
47 static int x = 15;
48 static int y = 6;
36/* return year day for Orthodox Easter using Gauss formula */
37/* (old style result) */
38
39static int
40paskha (R)
41int R; /*year*/
42{
43 int a, b, c, d, e;
44 static int x = 15;
45 static int y = 6;
46 extern int *cumdays;
49
50 a = R % 19;
51 b = R % 4;
52 c = R % 7;
53 d = (19*a + x) % 30;
54 e = (2*b + 4*c + 6*d + y) % 7;
55 return ((cumdays[2/*feb*/] + 22/*mar*/) + (d + e));
56}
57
58/* return year day for Orthodox Easter depending days */
59
60int
61getpaskha(s, year)
62 char *s;
63 int year;
64{
65 int offset;
47
48 a = R % 19;
49 b = R % 4;
50 c = R % 7;
51 d = (19*a + x) % 30;
52 e = (2*b + 4*c + 6*d + y) % 7;
53 return ((cumdays[2/*feb*/] + 22/*mar*/) + (d + e));
54}
55
56/* return year day for Orthodox Easter depending days */
57
58int
59getpaskha(s, year)
60 char *s;
61 int year;
62{
63 int offset;
64 extern struct fixs npaskha;
66
67 if (strncasecmp(s, PASKHA, PASKHALEN) == 0)
68 s += PASKHALEN;
65
66 if (strncasecmp(s, PASKHA, PASKHALEN) == 0)
67 s += PASKHALEN;
69 else if (strncasecmp(s, PASKHA1, PASKHALEN1) == 0)
70 s += PASKHALEN1;
68 else if ( npaskha.name != NULL
69 && strncasecmp(s, npaskha.name, npaskha.len) == 0
70 )
71 s += npaskha.len;
71 else
72 return 0;
73
74
75 /* Paskha+1 or Paskha-2
76 * ^ ^ */
77
78 switch(*s) {

--- 13 unchanged lines hidden ---
72 else
73 return 0;
74
75
76 /* Paskha+1 or Paskha-2
77 * ^ ^ */
78
79 switch(*s) {

--- 13 unchanged lines hidden ---