Module Name: src
Committed By: mrg
Date: Sun Feb 3 10:45:58 UTC 2019
Modified Files:
src/games/backgammon/backgammon: main.c
src/tests/lib/libc/misc: t_ubsan.c
Log Message:
- avoid multipling a boolean value, use &&.
To generate a diff of this commit:
cvs rdiff -u -r1.32 -r1.33 src/games/backgammon/backgammon/main.c
cvs rdiff -u -r1.1 -r1.2 src/tests/lib/libc/misc/t_ubsan.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/games/backgammon/backgammon/main.c
diff -u src/games/backgammon/backgammon/main.c:1.32 src/games/backgammon/backgammon/main.c:1.33
--- src/games/backgammon/backgammon/main.c:1.32 Sat Mar 22 23:10:36 2014
+++ src/games/backgammon/backgammon/main.c Sun Feb 3 10:45:58 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.32 2014/03/22 23:10:36 dholland Exp $ */
+/* $NetBSD: main.c,v 1.33 2019/02/03 10:45:58 mrg Exp $ */
/*
* Copyright (c) 1980, 1993
@@ -39,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1980, 19
#if 0
static char sccsid[] = "@(#)main.c 8.1 (Berkeley) 5/31/93";
#else
-__RCSID("$NetBSD: main.c,v 1.32 2014/03/22 23:10:36 dholland Exp $");
+__RCSID("$NetBSD: main.c,v 1.33 2019/02/03 10:45:58 mrg Exp $");
#endif
#endif /* not lint */
@@ -465,7 +465,7 @@ main(int argc __unused, char **argv)
mflag = 0;
l = bar + 7 * cturn;
for (i = bar; i != l; i += cturn)
- if (board[i] * cturn)
+ if (board[i] && cturn)
mflag++;
/* compute game value */
Index: src/tests/lib/libc/misc/t_ubsan.c
diff -u src/tests/lib/libc/misc/t_ubsan.c:1.1 src/tests/lib/libc/misc/t_ubsan.c:1.2
--- src/tests/lib/libc/misc/t_ubsan.c:1.1 Fri Aug 3 04:18:40 2018
+++ src/tests/lib/libc/misc/t_ubsan.c Sun Feb 3 10:45:58 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: t_ubsan.c,v 1.1 2018/08/03 04:18:40 kamil Exp $ */
+/* $NetBSD: t_ubsan.c,v 1.2 2019/02/03 10:45:58 mrg Exp $ */
/*-
* Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
#include <sys/cdefs.h>
__COPYRIGHT("@(#) Copyright (c) 2018\
The NetBSD Foundation, inc. All rights reserved.");
-__RCSID("$NetBSD: t_ubsan.c,v 1.1 2018/08/03 04:18:40 kamil Exp $");
+__RCSID("$NetBSD: t_ubsan.c,v 1.2 2019/02/03 10:45:58 mrg Exp $");
#include <sys/types.h>
#include <sys/wait.h>
@@ -376,7 +376,7 @@ test_mul_overflow_signed(void)
volatile int a = INT_MAX;
volatile int b = atoi("2");
- raise((a * b) ? SIGSEGV : SIGBUS);
+ raise((a && b) ? SIGSEGV : SIGBUS);
}
UBSAN_TC_BODY(mul_overflow_signed, tc)
