[src/trunk]: src/games/worm remove cpp abuse

[dholland <dholland%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/0492f91d2641
branches:  trunk
changeset: 810086:0492f91d2641
user:      dholland <dholland%NetBSD.org@localhost>
date:      Mon Aug 17 17:17:01 2015 +0000

description:
remove cpp abuse

diffstat:

 games/worm/worm.c |  23 ++++++++++++++---------
 1 files changed, 14 insertions(+), 9 deletions(-)

diffs (71 lines):

diff -r f7ab1b233289 -r 0492f91d2641 games/worm/worm.c
--- a/games/worm/worm.c Mon Aug 17 16:31:15 2015 +0000
+++ b/games/worm/worm.c Mon Aug 17 17:17:01 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: worm.c,v 1.30 2011/05/23 23:03:38 joerg Exp $  */
+/*     $NetBSD: worm.c,v 1.31 2015/08/17 17:17:01 dholland Exp $       */
 
 /*
  * Copyright (c) 1980, 1993
@@ -39,7 +39,7 @@
 #if 0
 static char sccsid[] = "@(#)worm.c     8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: worm.c,v 1.30 2011/05/23 23:03:38 joerg Exp $");
+__RCSID("$NetBSD: worm.c,v 1.31 2015/08/17 17:17:01 dholland Exp $");
 #endif
 #endif /* not lint */
 
@@ -56,7 +56,6 @@
 #include <termios.h>
 #include <unistd.h>
 
-#define newlink() (struct body *) malloc(sizeof (struct body));
 #define HEAD '@'
 #define BODY 'o'
 #define LENGTH 7
@@ -94,6 +93,18 @@
 static void setup(void);
 static void wake(int);
 
+static struct body *
+newlink(void)
+{
+       struct body *b;
+
+       b = malloc(sizeof(*b));
+       if (b == NULL) {
+               err(EXIT_FAILURE, NULL);
+       }
+       return b;
+}
+
 int
 main(int argc, char **argv)
 {
@@ -163,16 +174,12 @@
 
        np = NULL;
        head = newlink();
-       if (head == NULL)
-               err(1, NULL);
        head->x = start_len % (COLS-5) + 2;
        head->y = LINES / 2;
        head->next = NULL;
        display(head, HEAD);
        for (i = 0, bp = head; i < start_len; i++, bp = np) {
                np = newlink();
-               if (np == NULL)
-                       err(1, NULL);
                np->next = bp;
                bp->prev = np;
                if (((bp->x <= 2) && (j == 1)) || ((bp->x >= COLS-4) && (j == -1))) {
@@ -326,8 +333,6 @@
        }
        else if(ch != ' ') crash();
        nh = newlink();
-       if (nh == NULL)
-               err(1, NULL);
        nh->next = NULL;
        nh->prev = head;
        head->next = nh;