1 files changed, 3 insertions, 4 deletions

diff --git a/contrib/cvs/diff/diff.c b/contrib/cvs/diff/diff.c
index 3467b537aeca..e5f7e42bfcda 100644
--- a/contrib/cvs/diff/diff.c
+++ b/contrib/cvs/diff/diff.c
@@ -13,9 +13,7 @@ but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
-You should have received a copy of the GNU General Public License
-along with GNU DIFF; see the file COPYING.  If not, write to
-the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
+*/
 
 /* GNU DIFF was written by Mike Haertel, David Hayes,
    Richard Stallman, Len Tower, and Paul Eggert.  */
@@ -690,7 +688,8 @@ diff_run (argc, argv, out, callbacks_arg)
 
   /* Set the jump buffer, so that diff may abort execution without
      terminating the process. */
-  if ((val = setjmp (diff_abort_buf)) != 0)
+  val = setjmp (diff_abort_buf);
+  if (val != 0)
     {
       optind = optind_old;
       if (opened_file)