Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remove cpp abuse

Browse Source
This commit is contained in:
dholland 2015-08-17 17:17:01 +00:00
parent 2343b2000f
commit d1bc0cfc4f
1 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
games/worm/worm.c
View File

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