--- src/usr.bin/calendar/paskha.c	2003/10/02 17:42:26	1.3
+++ src/usr.bin/calendar/paskha.c	2006/09/16 18:38:00	1.4
@@ -37,26 +37,28 @@
 #define PASKHA "paskha"
 #define PASKHALEN (sizeof(PASKHA) - 1)
 
-static int paskha (int);
+extern int *cumdays;
+extern struct fixs npaskha;
+
+static int paskha(int);
 
 /* return year day for Orthodox Easter using Gauss formula */
 /* (old style result) */
 
 /* R: year */
 static int
-paskha (int R)
+paskha(int R)
 {
 	int a, b, c, d, e;
 	static int x = 15;
 	static int y = 6;
-	extern int *cumdays;
 
 	a = R % 19;
 	b = R % 4;
 	c = R % 7;
 	d = (19*a + x) % 30;
 	e = (2*b + 4*c + 6*d + y) % 7;
-	return (((cumdays[3] + 1) + 22) + (d + e));
+	return(((cumdays[3] + 1) + 22) + (d + e));
 }
 
 /* return year day for Orthodox Easter depending days */
@@ -65,23 +67,21 @@ int
 getpaskha(char *s, int year)
 {
 	int offset;
-	extern struct fixs npaskha;
 
 	if (strncasecmp(s, PASKHA, PASKHALEN) == 0)
 	    s += PASKHALEN;
-	else if (   npaskha.name != NULL
+	else if (npaskha.name != NULL
 		 && strncasecmp(s, npaskha.name, npaskha.len) == 0
 		)
 	    s += npaskha.len;
 	else
-	    return 0;
+	    return(0);
 
 
 	/* Paskha+1  or Paskha-2
 	 *       ^            ^   */
 
 	switch(*s) {
-
 	case '-':
 	case '+':
 	    offset = atoi(s);
@@ -92,5 +92,5 @@ getpaskha(char *s, int year)
 	    break;
 	}
 	    
-	return (paskha(year) + offset + 13/* new style */);
+	return(paskha(year) + offset + 13/* new style */);
 }