--- a/bdengine.c	Mon Dec 17 08:02:15 2007 +0100
+++ b/bdengine.c	Mon Dec 17 11:28:40 2007 +0100
@@ -82,8 +82,8 @@
 	$Id: xmalloc.c,v 1.2 1999/01/16 17:08:59 andy Exp $
 */
 
-void *xmalloc (size_t size) {
-	register void *value = malloc (size);
+void* xmalloc (size_t size) {
+	register void* value = malloc (size);
 	if (value == 0) {
 		fprintf(stderr, "virtual memory exhausted\n");
 		exit(1);
@@ -92,8 +92,8 @@
 }
 
 
-void *xrealloc (void *ptr, size_t size) {
-	register void *value = realloc (ptr, size);
+void* xrealloc (void* ptr, size_t size) {
+	register void* value = realloc (ptr, size);
 	if (value == 0) {
 		fprintf(stderr, "virtual memory exhausted\n");
 		exit(1);
@@ -112,14 +112,11 @@
 int evcmp(const void *e1, const void *e2);
 char *deffname(void);
 
-/*struct event *dir_include(char *dir, char *parm);*/
 
 /* ========== Global variables */
 
 struct date today;
 int iDWarn   = DEF_WARN;
-int iMaxWarn = MAX_WARN;
-int iMinWarn = MIN_WARN;
 
 const unsigned MLENDAT[]={31,-1,31,30,31,30,31,31,30,31,30,31};
 
@@ -290,7 +287,7 @@
 		if (evl[i].warn == -1 && delta(&(evl[i].date))==0) {
 			 append(buf, evl[i].text);
 		} else if (evl[i].enddate.day == 0) {
-			if (delta(&(evl[i].date)) <= warnperiod(evl[i])) {
+			if (delta(&(evl[i].date)) <= evl[i].warn) {
 				append(buf, evl[i].text);
 				append(buf, " ");
 				tmp = tdelta(&(evl[i].date));
@@ -298,7 +295,7 @@
 				free(tmp);
 			}
 		} else {
-			if (delta(&(evl[i].date)) <= warnperiod(evl[i])) {
+			if (delta(&(evl[i].date)) <= evl[i].warn) {
 				append(buf, evl[i].text);
 				append(buf, " for ");
 				/* +1 because, if the difference between two dates is one day,
@@ -310,7 +307,7 @@
 				append(buf, " ");
 				tmp = tdelta(&(evl[i].date));
 				append(buf, tmp);
-			} else if (delta(&(evl[i].enddate)) <= warnperiod(evl[i])) {
+			} else if (delta(&(evl[i].enddate)) <= evl[i].warn) {
 				append(buf, evl[i].text);
 				append(buf, " ");
 				j = delta(&(evl[i].enddate));