===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/cvs/diff.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -c -r1.17 -r1.18
*** src/usr.bin/cvs/diff.c	2005/01/13 23:39:42	1.17
--- src/usr.bin/cvs/diff.c	2005/01/14 00:35:15	1.18
***************
*** 1,4 ****
! /*	$OpenBSD: diff.c,v 1.17 2005/01/13 23:39:42 jfb Exp $	*/
  /*
   * Copyright (C) Caldera International Inc.  2001-2002.
   * All rights reserved.
--- 1,4 ----
! /*	$OpenBSD: diff.c,v 1.18 2005/01/14 00:35:15 jfb Exp $	*/
  /*
   * Copyright (C) Caldera International Inc.  2001-2002.
   * All rights reserved.
***************
*** 832,838 ****
  	int y, x = 1;
  
  	if (n == 0)
! 		return(0);
  
  	do { /* newton was a stinker */
  		y = x;
--- 832,838 ----
  	int y, x = 1;
  
  	if (n == 0)
! 		return (0);
  
  	do { /* newton was a stinker */
  		y = x;
***************
*** 851,857 ****
  	int oldc, tc, oldl;
  	u_int numtries;
  
! 	const u_int bound = dflag ? UINT_MAX : MAX(256, isqrt(n));
  
  	k = 0;
  	c[0] = newcand(0, 0, 0);
--- 851,858 ----
  	int oldc, tc, oldl;
  	u_int numtries;
  
! 	/* XXX move the isqrt() out of the macro to avoid multiple calls */
! 	const u_int bound = dflag ? UINT_MAX : MAX(256, (u_int)isqrt(n));
  
  	k = 0;
  	c[0] = newcand(0, 0, 0);