style(9)ify usr.bin/calendar

PR:		bin/118644
Approved by:	bde@ (mentor)
MFC after:	1 week

1 files changed, 40 insertions, 36 deletions

diff --git a/usr.bin/calendar/calendar.h b/usr.bin/calendar/calendar.h
index 4f4297b..c9c37ce 100644
--- a/usr.bin/calendar/calendar.h
+++ b/usr.bin/calendar/calendar.h
@@ -45,49 +45,53 @@ extern int *cumdays;
 extern int yrdays;
 extern struct fixs neaster, npaskha;
 
-void	 cal(void);
-void	 closecal(FILE *);
-int	 getday(char *);
-int	 getdayvar(char *);
-int	 getfield(char *, char **, int *);
-int	 getmonth(char *);
-int	 geteaster(char *, int);
-int      getpaskha(char *, int);
-int      easter(int);
-int	 isnow(char *, int *, int *, int *);
+void	cal(void);
+void	closecal(FILE *);
+int	getday(char *);
+int	getdayvar(char *);
+int	getfield(char *, char **, int *);
+int	getmonth(char *);
+int	geteaster(char *, int);
+int	getpaskha(char *, int);
+int	easter(int);
+int	isnow(char *, int *, int *, int *);
 FILE	*opencal(void);
-void	 settime(time_t);
-time_t   Mktime(char *);
-void	 usage(void);
-void     setnnames(void);
+void	settime(time_t);
+time_t	Mktime(char *);
+void	usage(void);
+void	setnnames(void);
 
 #define isleap(y) ((((y) % 4) == 0 && ((y) % 100) != 0) || ((y) % 400) == 0)
 
 /* some flags */
-#define	F_ISMONTH	0x01 /* month (Januar ...) */
-#define	F_ISDAY		0x02 /* day of week (Sun, Mon, ...) */
-#define	F_ISDAYVAR	0x04 /* variables day of week, like SundayLast */
-#define	F_EASTER	0x08 /* Easter or easter depending days */
+#define	F_ISMONTH	0x01	/* month (January ...) */
+#define	F_ISDAY		0x02	/* day of week (Sun, Mon, ...) */
+#define	F_ISDAYVAR	0x04	/* variables day of week, like SundayLast */
+#define	F_EASTER	0x08	/* Easter or easter depending days */
 
-extern int f_dayAfter;	/* days after current date */
-extern int f_dayBefore; /* days bevore current date */
-extern int Friday;	/* day before weekend */
+extern int	f_dayAfter;	/* days after current date */
+extern int	f_dayBefore;	/* days before current date */
+extern int	Friday;		/* day before weekend */
 
-struct fixs {
-	char *name;
-	int len;
-};
-
-struct event *event_add(struct event *events, int month, int day, char *date,
-                        int var, char *txt);
-void event_continue(struct event *events, char *txt);
-void event_print_all(FILE *fp, struct event *events);
-/* Stored calendar event */
+/*
+ * Event sorting related functions:
+ * - Use event_add() to create a new event
+ * - Use event_continue() to add more text to the last added event
+ * - Use event_print_all() to display them in time chronological order
+ */
+struct event *event_add(struct event *, int, int, char *, int, char *);
+void	event_continue(struct event *events, char *txt);
+void	event_print_all(FILE *fp, struct event *events);
 struct event {
-	int month;
-	int day;
-	int var;
-	char *date;
-	char *text;
+	int	month;
+	int	day;
+	int	var;
+	char	*date;
+	char	*text;
 	struct event *next;
 };
+
+struct fixs {
+	char	*name;
+	int	len;
+};