Sat May 28 04:52:23 2022 UTC ()

gomoku: reduce scope of local variable

No functional change.


(rillig)

diff -r1.25 -r1.26 src/games/gomoku/makemove.c

--- src/games/gomoku/makemove.c 2022/05/27 23:29:15	1.25
+++ src/games/gomoku/makemove.c 2022/05/28 04:52:23	1.26

 @@ -1,14 +1,14 @@
-/*	$NetBSD: makemove.c,v 1.25 2022/05/27 23:29:15 rillig Exp $	*/
+/*	$NetBSD: makemove.c,v 1.26 2022/05/28 04:52:23 rillig Exp $	*/
 /*
  * Copyright (c) 1994
  *	The Regents of the University of California.  All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * Ralph Campbell.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -24,27 +24,27 @@
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
 /*	@(#)makemove.c	8.2 (Berkeley) 5/3/95	*/
-__RCSID("$NetBSD: makemove.c,v 1.25 2022/05/27 23:29:15 rillig Exp $");
+__RCSID("$NetBSD: makemove.c,v 1.26 2022/05/28 04:52:23 rillig Exp $");
 #include "gomoku.h"
 		/* direction deltas */
 const int     dd[4] = {
 ,			/* right */
 	-(BSZ + 1) + 1,		/* down + right */
 	-(BSZ + 1),		/* down */
 	-(BSZ + 1) - 1		/* down + left */
 };
 static const int weight[5] = { 0, 1, 7, 22, 100 };
 @@ -207,27 +207,26 @@ makemove(int us, int mv)
 	if (nmoves == BSZ * BSZ)
 		return TIE;
 	return MOVEOK;
+}
 /*
  * fix up the overlap array due to updating spot osp.
  */
 static void
 update_overlap(struct spotstr *osp)
+{
 	struct spotstr *esp = NULL;
 	for (int r = 4; --r >= 0; ) {		/* for each direction */
 	    int d = dd[r];
 	    struct spotstr *sp1 = osp;
 	    int bmask = BFLAG << r;
 	    for (int f = 0; f < 6; f++, sp1 -= d) {	/* for each frame */
 		if (sp1->s_occ == BORDER)
 		    break;
 		if ((sp1->s_flags & bmask) != 0)
 		    continue;
 		/*
 		 * Update all other frames that intersect the current one
 		 * to indicate whether they still overlap or not.
 @@ -241,32 +240,34 @@ update_overlap(struct spotstr *osp)
 		for (int i = f + 1; i < 6; i++, sp2 -= d) {
 		    if (sp2->s_occ == BORDER)
 			break;
 		    if ((sp2->s_flags & bmask) != 0)
 			continue;
 		    /*
 		     * count the number of empty spots to see if there is
 		     * still an overlap.
 		     */
 		    int n = 0;
 		    struct spotstr *sp = sp1;
 		    struct spotstr *esp = NULL;
 		    for (int b = i - f; b < 5; b++, sp += d) {
 			if (sp->s_occ == EMPTY) {
 			    esp = sp;	/* save the intersection point */
 			    n++;
+			}
+		    }
 		    int b = (int)(sp2->s_frame[r] - frames);
 		    if (n == 0) {
 			if (sp->s_occ == EMPTY) {
 			    str[b] &= 0xA;
 			    overlap[b * FAREA + a] &= 0xC;
 			    intersect[a * FAREA + b] = (short)(sp - board);
 			    intersect[b * FAREA + a] = (short)(sp - board);
 			} else {
 			    str[b] = 0;
 			    overlap[b * FAREA + a] = 0;
+			}
 		    } else if (n == 1) {
 			if (sp->s_occ == EMPTY) {