Sun May 2 12:25:56 2021 UTC ()

fish: remove trailing whitespace


(rillig)

diff -r1.25 -r1.26 src/games/fish/fish.c

--- src/games/fish/fish.c 2021/05/02 12:24:59	1.25
+++ src/games/fish/fish.c 2021/05/02 12:25:55	1.26

 @@ -1,14 +1,14 @@
-/*	$NetBSD: fish.c,v 1.25 2021/05/02 12:24:59 rillig Exp $	*/
+/*	$NetBSD: fish.c,v 1.26 2021/05/02 12:25:55 rillig Exp $	*/
 /*-
  * Copyright (c) 1990, 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * Muffy Barkocy.
+ *
  * 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.
 @@ -32,27 +32,27 @@
  * SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
 #ifndef lint
 __COPYRIGHT("@(#) Copyright (c) 1990, 1993\
  The Regents of the University of California.  All rights reserved.");
 #endif /* not lint */
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)fish.c	8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: fish.c,v 1.25 2021/05/02 12:24:59 rillig Exp $");
+__RCSID("$NetBSD: fish.c,v 1.26 2021/05/02 12:25:55 rillig Exp $");
 #endif
 #endif /* not lint */
 #include <sys/types.h>
 #include <sys/wait.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <string.h>
 #include <err.h>
 #include "pathnames.h"
 @@ -110,27 +110,27 @@ main(int argc, char **argv)
 			usage();
+		}
 	instructions();
 	init();
 	if (arc4random_uniform(2) == 1) {
 		printplayer(COMPUTER);
 		(void)printf("get to start.\n");
 		goto istart;
+	}
 	printplayer(USER);
 	(void)printf("get to start.\n");
 	for (;;) {
 		move = usermove();
 		if (!comphand[move]) {
 			if (gofish(move, USER, userhand))
 				continue;
 		} else {
 			goodmove(USER, move, userhand, comphand);
 			continue;
+		}
 istart:		for (;;) {
 			move = compmove();
 			if (!userhand[move]) {
 @@ -233,32 +233,32 @@ promove(void)
 	for (i = 0; i < RANKS; ++i)
 		if (userasked[i] &&
 		    comphand[i] > 0 && comphand[i] < CARDS) {
 			userasked[i] = 0;
 			return(i);
+		}
 	if (arc4random_uniform(3) == 1) {
 		for (i = 0;; ++i)
 			if (comphand[i] && comphand[i] != CARDS) {
 				max = i;
 				break;
+			}
 		while (++i < RANKS)
 			if (comphand[i] != CARDS &&
 			    comphand[i] > comphand[max])
 				max = i;
 		return(max);
+	}
 	if (arc4random_uniform(1024) == 0723) {
 		for (i = 0; i < RANKS; ++i)
 			if (userhand[i] && comphand[i])
 				return(i);
+	}
 	for (;;) {
 		for (i = 0; i < RANKS; ++i)
 			if (comphand[i] && comphand[i] != CARDS &&
 			    !asked[i])
 				return(i);
 		for (i = 0; i < RANKS; ++i)
 			asked[i] = 0;
+	}
 @@ -359,27 +359,27 @@ printplayer(int player)
 	case USER:
 		(void)printf("You ");
 		break;
+	}
+}
 static void
 printhand(const int *hand)
+{
 	int book, i, j;
 	for (book = i = 0; i < RANKS; i++)
 		if (hand[i] < CARDS)
 			for (j = hand[i]; --j >= 0;)
 				PRC(i);
 		else
 			++book;
 	if (book) {
 		(void)printf(" + Book%s of", book > 1 ? "s" : "");
 		for (i = 0; i < RANKS; i++)
 			if (hand[i] == CARDS)
 				PRC(i);
+	}
 	(void)putchar('\n');
+}
 static int