Author: bapt
Date: Thu May 25 17:55:40 2017
New Revision: 318889
URL: https://svnweb.freebsd.org/changeset/base/318889
Log:
Remove the MAX_CHECK macro, it was initially used to test if a file was a
text file or not.
The check is not done by diff3 but by diff (the argument -a is directly passed
to diff(1))
Modified:
head/usr.bin/diff3/diff3.c
Modified: head/usr.bin/diff3/diff3.c
==============================================================================
--- head/usr.bin/diff3/diff3.c Thu May 25 17:45:50 2017 (r318888)
+++ head/usr.bin/diff3/diff3.c Thu May 25 17:55:40 2017 (r318889)
@@ -149,10 +149,8 @@ enum {
STRIPCR_OPT,
};
-#define MAX_CHECK 768 /* 3 kb of chars */
#define DIFF_PATH "/usr/bin/diff"
-
#define OPTIONS "3aAeEiL:mTxX"
static struct option longopts[] = {
{ "ed", no_argument, NULL, 'e' },
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
