fix some lint

[bsdgames-darwin.git] / trek / schedule.c

diff --git a/trek/schedule.c b/trek/schedule.c
index fa7bced09d9822ec137f9c90fef3eea4a861fa76..d3c0c2869dc405ede7529226636f6a183d110077 100644 (file)
--- a/trek/schedule.c
+++ b/trek/schedule.c
@@ -1,6 +1,8 @@
+/*     $NetBSD: schedule.c,v 1.6 2006/03/19 00:56:12 christos Exp $    */
+
 /*
- * Copyright (c) 1980 Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1980, 1993
+ *     The Regents of the University of California.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -10,11 +12,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *     This product includes software developed by the University of
- *     California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
@@ -31,11 +29,19 @@
  * SUCH DAMAGE.
  */
 
+#include <sys/cdefs.h>
 #ifndef lint
-static char sccsid[] = "@(#)schedule.c 5.4 (Berkeley) 6/1/90";
+#if 0
+static char sccsid[] = "@(#)schedule.c 8.1 (Berkeley) 5/31/93";
+#else
+__RCSID("$NetBSD: schedule.c,v 1.6 2006/03/19 00:56:12 christos Exp $");
+#endif
 #endif /* not lint */
 
-# include      "trek.h"
+#include <stdio.h>
+#include <math.h>
+#include <err.h>
+#include "trek.h"
 
 /*
 **  SCHEDULE AN EVENT
@@ -53,8 +59,8 @@ double        offset;
 char   x, y;
 char   z;
 {
-       register struct event   *e;
-       register int            i;
+       struct event    *e;
+       int             i;
        double                  date;
 
        date = Now.date + offset;
@@ -74,10 +80,10 @@ char        z;
                e->x = x;
                e->y = y;
                e->systemname = z;
-               Now.eventptr[type] = e;
+               Now.eventptr[type & ~E_GHOST] = e;
                return (e);
        }
-       syserr("Cannot schedule event %d parm %d %d %d", type, x, y, z);
+       errx(1, "Cannot schedule event %d parm %d %d %d", type, x, y, z);
 }
 
 
@@ -88,12 +94,13 @@ char        z;
 **     time plus 'offset'.
 */
 
+void
 reschedule(e1, offset)
 struct event   *e1;
 double         offset;
 {
        double                  date;
-       register struct event   *e;
+       struct event    *e;
 
        e = e1;
 
@@ -114,10 +121,11 @@ double            offset;
 **     The event at slot 'e' is deleted.
 */
 
+void
 unschedule(e1)
 struct event   *e1;
 {
-       register struct event   *e;
+       struct event    *e;
 
        e = e1;
 
@@ -145,7 +153,7 @@ int ev1;
 int    factor;
 int    x, y, z;
 {
-       register int    ev;
+       int     ev;
 
        ev = ev1;
        return (schedule(ev, -Param.eventdly[ev] * Param.time * log(franf()) / factor, x, y, z));
@@ -159,13 +167,14 @@ int       x, y, z;
 **     division factor.  Look at the code to see what really happens.
 */
 
+void
 xresched(e1, ev1, factor)
 struct event   *e1;
 int            ev1;
 int            factor;
 {
-       register int            ev;
-       register struct event   *e;
+       int             ev;
+       struct event    *e;
 
        ev = ev1;
        e = e1;