summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>2003-07-29 18:38:48 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>2003-07-29 18:38:48 +0000
commitef45b046d50271fb77ae73c50cf2bb20badc690f (patch)
tree41a8c9d7625043e65a1da8240e4cfbc64a6587ed
parente014480e0708ef1199ea0cc27380825b8e6f15d6 (diff)
clean
-rw-r--r--usr.bin/diff/diff.c8
-rw-r--r--usr.bin/diff/diffreg.c6
2 files changed, 7 insertions, 7 deletions
diff --git a/usr.bin/diff/diff.c b/usr.bin/diff/diff.c
index 0338b7ec00c..2c2de7615a4 100644
--- a/usr.bin/diff/diff.c
+++ b/usr.bin/diff/diff.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: diff.c,v 1.36 2003/07/27 18:45:55 millert Exp $ */
+/* $OpenBSD: diff.c,v 1.37 2003/07/29 18:38:47 deraadt Exp $ */
/*
* Copyright (c) 2003 Todd C. Miller <Todd.Miller@courtesan.com>
@@ -21,7 +21,7 @@
*/
#ifndef lint
-static const char rcsid[] = "$OpenBSD: diff.c,v 1.36 2003/07/27 18:45:55 millert Exp $";
+static const char rcsid[] = "$OpenBSD: diff.c,v 1.37 2003/07/29 18:38:47 deraadt Exp $";
#endif /* not lint */
#include <sys/param.h>
@@ -39,8 +39,8 @@ static const char rcsid[] = "$OpenBSD: diff.c,v 1.36 2003/07/27 18:45:55 millert
#include "diff.h"
-int aflag, bflag, dflag, iflag, lflag, Nflag, Pflag, rflag, sflag, tflag,
- Tflag, wflag;
+int aflag, bflag, dflag, iflag, lflag, Nflag, Pflag, rflag;
+int sflag, tflag, Tflag, wflag;
int format, context, status;
char *start, *ifdefname, *diffargs, *label;
struct stat stb1, stb2;
diff --git a/usr.bin/diff/diffreg.c b/usr.bin/diff/diffreg.c
index 33a2cd31581..86237b1cb9c 100644
--- a/usr.bin/diff/diffreg.c
+++ b/usr.bin/diff/diffreg.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: diffreg.c,v 1.44 2003/07/27 18:58:26 millert Exp $ */
+/* $OpenBSD: diffreg.c,v 1.45 2003/07/29 18:38:47 deraadt Exp $ */
/*
* Copyright (C) Caldera International Inc. 2001-2002.
@@ -65,7 +65,7 @@
*/
#ifndef lint
-static const char rcsid[] = "$OpenBSD: diffreg.c,v 1.44 2003/07/27 18:58:26 millert Exp $";
+static const char rcsid[] = "$OpenBSD: diffreg.c,v 1.45 2003/07/29 18:38:47 deraadt Exp $";
#endif /* not lint */
#include <sys/param.h>
@@ -626,7 +626,7 @@ stone(int *a, int n, int *b, int *c)
int i, k, y, j, l;
int oldc, tc, oldl;
u_int loopcount;
-
+
const u_int bound = dflag ? UINT_MAX : max(256, isqrt(n));
k = 0;