Date: Thu, 25 May 2017 17:55:40 +0000 (UTC) From: Baptiste Daroussin <bapt@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r318889 - head/usr.bin/diff3 Message-ID: <201705251755.v4PHteJ0041200@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
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' },
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201705251755.v4PHteJ0041200>