sprintf -> snprintf, plus some use of strlcpy/strlcat where appropriate

[bsdgames-darwin.git] / tetris / shapes.c

diff --git a/tetris/shapes.c b/tetris/shapes.c
index 5421bcf0ef873bf6fd994c3f03f45a2ec33dd9c2..0ab43106edfce79c32d8b711dc40c4fd1455c099 100644 (file)
--- a/tetris/shapes.c
+++ b/tetris/shapes.c
@@ -1,4 +1,4 @@
-/*     $NetBSD: shapes.c,v 1.2 1995/04/22 07:42:44 cgd Exp $   */
+/*     $NetBSD: shapes.c,v 1.8 2009/05/25 04:33:53 dholland Exp $      */
 
 /*-
  * Copyright (c) 1992, 1993
@@ -15,11 +15,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.
  *
@@ -56,26 +52,26 @@
 #define        BC      B_COLS          /* bottom center */
 #define        BR      B_COLS+1        /* bottom right */
 
-struct shape shapes[] = {
-       /* 0*/  7,      TL, TC, MR,
-       /* 1*/  8,      TC, TR, ML,
-       /* 2*/  9,      ML, MR, BC,
-       /* 3*/  3,      TL, TC, ML,
-       /* 4*/  12,     ML, BL, MR,
-       /* 5*/  15,     ML, BR, MR,
-       /* 6*/  18,     ML, MR, /* sticks out */ 2,
-       /* 7*/  0,      TC, ML, BL,
-       /* 8*/  1,      TC, MR, BR,
-       /* 9*/  10,     TC, MR, BC,
-       /*10*/  11,     TC, ML, MR,
-       /*11*/  2,      TC, ML, BC,
-       /*12*/  13,     TC, BC, BR,
-       /*13*/  14,     TR, ML, MR,
-       /*14*/  4,      TL, TC, BC,
-       /*15*/  16,     TR, TC, BC,
-       /*16*/  17,     TL, MR, ML,
-       /*17*/  5,      TC, BC, BL,
-       /*18*/  6,      TC, BC, /* sticks out */ 2*B_COLS,
+const struct shape shapes[] = {
+       /* 0*/  { 7,    { TL, TC, MR, } },
+       /* 1*/  { 8,    { TC, TR, ML, } },
+       /* 2*/  { 9,    { ML, MR, BC, } },
+       /* 3*/  { 3,    { TL, TC, ML, } },
+       /* 4*/  { 12,   { ML, BL, MR, } },
+       /* 5*/  { 15,   { ML, BR, MR, } },
+       /* 6*/  { 18,   { ML, MR, 2   } },      /* sticks out */
+       /* 7*/  { 0,    { TC, ML, BL, } },
+       /* 8*/  { 1,    { TC, MR, BR, } },
+       /* 9*/  { 10,   { TC, MR, BC, } },
+       /*10*/  { 11,   { TC, ML, MR, } },
+       /*11*/  { 2,    { TC, ML, BC, } },
+       /*12*/  { 13,   { TC, BC, BR, } },
+       /*13*/  { 14,   { TR, ML, MR, } },
+       /*14*/  { 4,    { TL, TC, BC, } },
+       /*15*/  { 16,   { TR, TC, BC, } },
+       /*16*/  { 17,   { TL, MR, ML, } },
+       /*17*/  { 5,    { TC, BC, BL, } },
+       /*18*/  { 6,    { TC, BC, 2*B_COLS } }  /* sticks out */
 };
 
 /*
@@ -83,11 +79,9 @@ struct shape shapes[] = {
  * taking the current board into account.
  */
 int
-fits_in(shape, pos)
-       struct shape *shape;
-       register int pos;
+fits_in(const struct shape *shape, int pos)
 {
-       register int *o = shape->off;
+       const int *o = shape->off;
 
        if (board[pos] || board[pos + *o++] || board[pos + *o++] ||
            board[pos + *o])
@@ -100,11 +94,9 @@ fits_in(shape, pos)
  * if `onoff' is 1, and off if `onoff' is 0.
  */
 void
-place(shape, pos, onoff)
-       struct shape *shape;
-       register int pos, onoff;
+place(const struct shape *shape, int pos, int onoff)
 {
-       register int *o = shape->off;
+       const int *o = shape->off;
 
        board[pos] = onoff;
        board[pos + *o++] = onoff;