Don't cast the return value of calloc().

[bsdgames-darwin.git] / sail / misc.c

diff --git a/sail/misc.c b/sail/misc.c
index 2336c9c0298f8d486789455804eadf924c2ad57f..ac94e29550256193ddfd41fc5738dfa8f926ea6b 100644 (file)
--- a/sail/misc.c
+++ b/sail/misc.c
@@ -1,4 +1,4 @@
-/*     $NetBSD: misc.c,v 1.10 2001/01/04 03:51:24 jwise Exp $  */
+/*     $NetBSD: misc.c,v 1.18 2009/03/14 19:35:13 dholland Exp $       */

 
 /*
  * Copyright (c) 1983, 1993
 
 /*
  * Copyright (c) 1983, 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.
  * 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.
  *
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *


@@ -38,25 +34,22 @@
 #if 0
 static char sccsid[] = "@(#)misc.c     8.2 (Berkeley) 4/28/95";
 #else
 #if 0
 static char sccsid[] = "@(#)misc.c     8.2 (Berkeley) 4/28/95";
 #else

-__RCSID("$NetBSD: misc.c,v 1.10 2001/01/04 03:51:24 jwise Exp $");
+__RCSID("$NetBSD: misc.c,v 1.18 2009/03/14 19:35:13 dholland Exp $");

 #endif
 #endif /* not lint */
 
 #include <ctype.h>
 #include <stdio.h>
 #include <unistd.h>
 #endif
 #endif /* not lint */
 
 #include <ctype.h>
 #include <stdio.h>
 #include <unistd.h>

+#include <stdlib.h>
+#include <string.h>

 #include "extern.h"
 #include "pathnames.h"
 
 #include "extern.h"
 #include "pathnames.h"
 

-#define distance(x,y) (abs(x) >= abs(y) ? abs(x) + abs(y)/2 : abs(y) + abs(x)/2)
+#define distance(x,y) \
+       (abs(x) >= abs(y) ? abs(x) + abs(y)/2 : abs(y) + abs(x)/2)

 
 

-int    range(struct ship *, struct ship *);
-struct ship    *closestenemy(struct ship *, int, int);
-static int     angle(int, int);
-int    gunsbear(struct ship *, struct ship *);
-int    portside(struct ship *, struct ship *, int);
-int    colours(struct ship *);
-void   logger(struct ship *);
+static int angle(int, int);

 
 /* XXX */
 int
 
 /* XXX */
 int


@@ -114,27 +107,27 @@ closestenemy(struct ship *from, int side, int anyship)
 }
 
 static int
 }
 
 static int

-angle(int dr, int dc)
+angle(int Dr, int Dc)

 {
        int i;
 
 {
        int i;
 

-       if (dc >= 0 && dr > 0)
+       if (Dc >= 0 && Dr > 0)

                i = 0;
                i = 0;

-       else if (dr <= 0 && dc > 0)
+       else if (Dr <= 0 && Dc > 0)

                i = 2;
                i = 2;

-       else if (dc <= 0 && dr < 0)
+       else if (Dc <= 0 && Dr < 0)

                i = 4;
        else
                i = 6;
                i = 4;
        else
                i = 6;

-       dr = abs(dr);
-       dc = abs(dc);
-       if ((i == 0 || i == 4) && dc * 2.4 > dr) {
+       Dr = abs(Dr);
+       Dc = abs(Dc);
+       if ((i == 0 || i == 4) && Dc * 2.4 > Dr) {

                i++;
                i++;

-               if (dc > dr * 2.4)
+               if (Dc > Dr * 2.4)

                        i++;
                        i++;

-       } else if ((i == 2 || i == 6) && dr * 2.4 > dc) {
+       } else if ((i == 2 || i == 6) && Dr * 2.4 > Dc) {

                i++;
                i++;

-               if (dr > dc * 2.4)
+               if (Dr > Dc * 2.4)

                        i++;
        }
        return i % 8 + 1;
                        i++;
        }
        return i % 8 + 1;


@@ -196,7 +189,7 @@ colours(struct ship *sp)
        if (sp->file->struck)
                return flag;
        flag = *countryname[capship(sp)->nationality];
        if (sp->file->struck)
                return flag;
        flag = *countryname[capship(sp)->nationality];

-       return sp->file->FS ? flag : tolower(flag);
+       return sp->file->FS ? flag : tolower((unsigned char)flag);

 }
 
 void
 }
 
 void


@@ -221,7 +214,7 @@ logger(struct ship *s)
 #endif
        net = (float)s->file->points / s->specs->pts;
        persons = getw(fp);
 #endif
        net = (float)s->file->points / s->specs->pts;
        persons = getw(fp);

-       n = fread((char *)log, sizeof(struct logs), NLOG, fp);
+       n = fread(log, sizeof(struct logs), NLOG, fp);

        for (lp = &log[n]; lp < &log[NLOG]; lp++)
                lp->l_name[0] = lp->l_uid = lp->l_shipnum
                        = lp->l_gamenum = lp->l_netpoints = 0;
        for (lp = &log[n]; lp < &log[NLOG]; lp++)
                lp->l_name[0] = lp->l_uid = lp->l_shipnum
                        = lp->l_gamenum = lp->l_netpoints = 0;


@@ -233,14 +226,14 @@ logger(struct ship *s)
        for (lp = log; lp < &log[NLOG]; lp++)
                if (net > (float)lp->l_netpoints
                    / scene[lp->l_gamenum].ship[lp->l_shipnum].specs->pts) {
        for (lp = log; lp < &log[NLOG]; lp++)
                if (net > (float)lp->l_netpoints
                    / scene[lp->l_gamenum].ship[lp->l_shipnum].specs->pts) {

-                       fwrite((char *)log, sizeof (struct logs), lp - log, fp);
+                       fwrite(log, sizeof (struct logs), lp - log, fp);

                        strcpy(log[NLOG-1].l_name, s->file->captain);
                        log[NLOG-1].l_uid = getuid();
                        log[NLOG-1].l_shipnum = s->file->index;
                        log[NLOG-1].l_gamenum = game;
                        log[NLOG-1].l_netpoints = s->file->points;
                        strcpy(log[NLOG-1].l_name, s->file->captain);
                        log[NLOG-1].l_uid = getuid();
                        log[NLOG-1].l_shipnum = s->file->index;
                        log[NLOG-1].l_gamenum = game;
                        log[NLOG-1].l_netpoints = s->file->points;

-                       fwrite((char *)&log[NLOG-1], sizeof (struct logs), 1, fp);
-                       fwrite((char *)lp, sizeof (struct logs), &log[NLOG-1] - lp, fp);
+                       fwrite(&log[NLOG-1], sizeof (struct logs), 1, fp);
+                       fwrite(lp, sizeof (struct logs), &log[NLOG-1] - lp, fp);

                        break;
                }
 #ifdef LOCK_EX
                        break;
                }
 #ifdef LOCK_EX