summaryrefslogtreecommitdiffstats
path: root/usr.bin/rcs/diff.c
diff options
context:
space:
mode:
authorxsa <xsa@openbsd.org>2007-02-22 08:30:45 +0000
committerxsa <xsa@openbsd.org>2007-02-22 08:30:45 +0000
commitc2ac0f30588c967154c032cb24a0210e09828d52 (patch)
tree89f92b387b766680f21c73c5dd1adae7e1893538 /usr.bin/rcs/diff.c
parentdo not try to set IP_TTL on non-INET listening sockets, it's not going (diff)
downloadwireguard-openbsd-c2ac0f30588c967154c032cb24a0210e09828d52.tar.xz
wireguard-openbsd-c2ac0f30588c967154c032cb24a0210e09828d52.zip
Fix const inconsistencies, void pointer artithmetic;
Based on diff from otto@ in OpenCVS. OK otto@.
Diffstat (limited to 'usr.bin/rcs/diff.c')
-rw-r--r--usr.bin/rcs/diff.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/usr.bin/rcs/diff.c b/usr.bin/rcs/diff.c
index b5aa4f15729..929f198164a 100644
--- a/usr.bin/rcs/diff.c
+++ b/usr.bin/rcs/diff.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: diff.c,v 1.10 2006/09/27 06:25:46 ray Exp $ */
+/* $OpenBSD: diff.c,v 1.11 2007/02/22 08:30:45 xsa Exp $ */
/*
* Copyright (C) Caldera International Inc. 2001-2002.
* All rights reserved.
@@ -536,7 +536,8 @@ stone(int *a, int n, int *b, int *c, int flags)
u_int numtries;
/* XXX move the isqrt() out of the macro to avoid multiple calls */
- const u_int bound = (flags & D_MINIMAL) ? UINT_MAX : MAX(256, isqrt(n));
+ const u_int bound = (flags & D_MINIMAL) ? UINT_MAX :
+ MAX(256, (u_int)isqrt(n));
k = 0;
if ((ret = newcand(0, 0, 0)) < 0)