Fix merge conflicts

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

diff --git a/trek/damage.c b/trek/damage.c
index dfe29f40a0eabab1ed288b4edb9a1ea831fb9b14..73dfbee987d3d2b01a66fd6c34bdc814232bea23 100644 (file)
--- a/trek/damage.c
+++ b/trek/damage.c
@@ -1,4 +1,4 @@
-/*     $NetBSD: damage.c,v 1.4 1997/10/12 21:24:36 christos Exp $      */
+/*     $NetBSD: damage.c,v 1.8 2009/05/24 21:44:56 dholland Exp $      */
 
 /*
  * Copyright (c) 1980, 1993
@@ -12,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.
  *
@@ -38,7 +34,7 @@
 #if 0
 static char sccsid[] = "@(#)damage.c   8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: damage.c,v 1.4 1997/10/12 21:24:36 christos Exp $");
+__RCSID("$NetBSD: damage.c,v 1.8 2009/05/24 21:44:56 dholland Exp $");
 #endif
 #endif /* not lint */
 
@@ -56,12 +52,13 @@ __RCSID("$NetBSD: damage.c,v 1.4 1997/10/12 21:24:36 christos Exp $");
 **
 **     Note that the repair of the device occurs on a DATE, meaning
 **     that the dock() and undock() have to reschedule the event.
+**
+**  dev1 -- device index
+**  dam -- time to repair
 */
 
 void
-damage(dev1, dam)
-int    dev1;           /*  device index */
-double dam;            /* time to repair */
+damage(int dev1, double dam)
 {
        int             i;
        struct event    *e;
@@ -80,16 +77,14 @@ double      dam;            /* time to repair */
                dam *= Param.dockfac;
        /* set the damage flag */
        f = damaged(dev);
-       if (!f)
-       {
+       if (!f) {
                /* new damages -- schedule a fix */
                schedule(E_FIXDV, dam, 0, 0, dev);
                return;
        }
        /* device already damaged -- add to existing damages */
        /* scan for old damages */
-       for (i = 0; i < MAXEVENTS; i++)
-       {
+       for (i = 0; i < MAXEVENTS; i++) {
                e = &Event[i];
                if (e->evcode != E_FIXDV || e->systemname != dev)
                        continue;
@@ -97,5 +92,5 @@ double        dam;            /* time to repair */
                reschedule(e, e->date - Now.date + dam);
                return;
        }
-       errx(1, "Cannot find old damages %d\n", dev);
+       errx(1, "Cannot find old damages %d", dev);
 }