1.1 --- a/bdengine.c	Mon Dec 17 08:02:15 2007 +0100
     1.2 +++ b/bdengine.c	Mon Dec 17 11:28:40 2007 +0100
     1.3 @@ -82,8 +82,8 @@
     1.4  	$Id: xmalloc.c,v 1.2 1999/01/16 17:08:59 andy Exp $
     1.5  */
     1.6  
     1.7 -void *xmalloc (size_t size) {
     1.8 -	register void *value = malloc (size);
     1.9 +void* xmalloc (size_t size) {
    1.10 +	register void* value = malloc (size);
    1.11  	if (value == 0) {
    1.12  		fprintf(stderr, "virtual memory exhausted\n");
    1.13  		exit(1);
    1.14 @@ -92,8 +92,8 @@
    1.15  }
    1.16  
    1.17  
    1.18 -void *xrealloc (void *ptr, size_t size) {
    1.19 -	register void *value = realloc (ptr, size);
    1.20 +void* xrealloc (void* ptr, size_t size) {
    1.21 +	register void* value = realloc (ptr, size);
    1.22  	if (value == 0) {
    1.23  		fprintf(stderr, "virtual memory exhausted\n");
    1.24  		exit(1);
    1.25 @@ -112,14 +112,11 @@
    1.26  int evcmp(const void *e1, const void *e2);
    1.27  char *deffname(void);
    1.28  
    1.29 -/*struct event *dir_include(char *dir, char *parm);*/
    1.30  
    1.31  /* ========== Global variables */
    1.32  
    1.33  struct date today;
    1.34  int iDWarn   = DEF_WARN;
    1.35 -int iMaxWarn = MAX_WARN;
    1.36 -int iMinWarn = MIN_WARN;
    1.37  
    1.38  const unsigned MLENDAT[]={31,-1,31,30,31,30,31,31,30,31,30,31};
    1.39  
    1.40 @@ -290,7 +287,7 @@
    1.41  		if (evl[i].warn == -1 && delta(&(evl[i].date))==0) {
    1.42  			 append(buf, evl[i].text);
    1.43  		} else if (evl[i].enddate.day == 0) {
    1.44 -			if (delta(&(evl[i].date)) <= warnperiod(evl[i])) {
    1.45 +			if (delta(&(evl[i].date)) <= evl[i].warn) {
    1.46  				append(buf, evl[i].text);
    1.47  				append(buf, " ");
    1.48  				tmp = tdelta(&(evl[i].date));
    1.49 @@ -298,7 +295,7 @@
    1.50  				free(tmp);
    1.51  			}
    1.52  		} else {
    1.53 -			if (delta(&(evl[i].date)) <= warnperiod(evl[i])) {
    1.54 +			if (delta(&(evl[i].date)) <= evl[i].warn) {
    1.55  				append(buf, evl[i].text);
    1.56  				append(buf, " for ");
    1.57  				/* +1 because, if the difference between two dates is one day,
    1.58 @@ -310,7 +307,7 @@
    1.59  				append(buf, " ");
    1.60  				tmp = tdelta(&(evl[i].date));
    1.61  				append(buf, tmp);
    1.62 -			} else if (delta(&(evl[i].enddate)) <= warnperiod(evl[i])) {
    1.63 +			} else if (delta(&(evl[i].enddate)) <= evl[i].warn) {
    1.64  				append(buf, evl[i].text);
    1.65  				append(buf, " ");
    1.66  				j = delta(&(evl[i].enddate));