diff options
| author |   ray <ray@openbsd.org> | 2009-06-07 08:39:13 +0000 |
|---|---|---|
| committer | ray <ray@openbsd.org> | 2009-06-07 08:39:13 +0000 |
| commit | 57003866bf9d794e291e4f346ca84d4e954c9f0d (patch) | |
| tree | 31172ec207533c30e0dfb757d0e9c20d8a1bf39c /usr.bin/diff/diff.h | |
| parent | Document the gconf2 module. (diff) | |
| download | wireguard-openbsd-57003866bf9d794e291e4f346ca84d4e954c9f0d.tar.xz wireguard-openbsd-57003866bf9d794e291e4f346ca84d4e954c9f0d.zip | |
More cvs/diff/rcs convergence:
1. Mostly variable/function renaming, SIZE_T_MAX->SIZE_MAX, and
spacing.
2. One strchr -> strncspn.
3. diff had a weird thing where it set file[12] = ofile[12] but
never updated file or ofile, then if file and ofile were different
it freed it. I removed it.
OK millert
Diffstat (limited to 'usr.bin/diff/diff.h')
| -rw-r--r-- | usr.bin/diff/diff.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/usr.bin/diff/diff.h b/usr.bin/diff/diff.h index b66853302ce..5ac5f92e49a 100644 --- a/usr.bin/diff/diff.h +++ b/usr.bin/diff/diff.h @@ -1,4 +1,4 @@ -/* $OpenBSD: diff.h,v 1.31 2009/06/06 15:37:28 ray Exp $ */ +/* $OpenBSD: diff.h,v 1.32 2009/06/07 08:39:13 ray Exp $ */ /*- * Copyright (c) 1991, 1993 @@ -85,7 +85,7 @@ struct excludes { }; extern int lflag, Nflag, Pflag, rflag, sflag, Tflag; -extern int format, context, status; +extern int diff_format, diff_context, status; extern char *start, *ifdefname, *diffargs, *label[2], *ignore_pats; extern struct stat stb1, stb2; extern struct excludes *excludes_list; |