From owner-svn-soc-all@FreeBSD.ORG  Mon Jun 25 21:52:50 2012
Return-Path: <owner-svn-soc-all@FreeBSD.ORG>
Delivered-To: svn-soc-all@FreeBSD.org
Received: from socsvn.FreeBSD.org (unknown [IPv6:2001:4f8:fff6::2f])
	by hub.freebsd.org (Postfix) with SMTP id 02ED7106566C
	for <svn-soc-all@FreeBSD.org>; Mon, 25 Jun 2012 21:52:48 +0000 (UTC)
	(envelope-from jhagewood@FreeBSD.org)
Received: by socsvn.FreeBSD.org (sSMTP sendmail emulation);
	Mon, 25 Jun 2012 21:52:47 +0000
Date: Mon, 25 Jun 2012 21:52:47 +0000
From: jhagewood@FreeBSD.org
To: svn-soc-all@FreeBSD.org
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Message-Id: <20120625215248.02ED7106566C@hub.freebsd.org>
Cc: 
Subject: socsvn commit: r238288 - in soc2012/jhagewood/diff: . diff
X-BeenThere: svn-soc-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the entire Summer of Code repository
	<svn-soc-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-soc-all>,
	<mailto:svn-soc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-soc-all>
List-Post: <mailto:svn-soc-all@freebsd.org>
List-Help: <mailto:svn-soc-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-soc-all>,
	<mailto:svn-soc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 25 Jun 2012 21:52:50 -0000

Author: jhagewood
Date: Mon Jun 25 21:52:47 2012
New Revision: 238288
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=238288

Log:

Modified:
  soc2012/jhagewood/diff/diff/diff.c
  soc2012/jhagewood/diff/hagewood-diff.patch

Modified: soc2012/jhagewood/diff/diff/diff.c
==============================================================================
--- soc2012/jhagewood/diff/diff/diff.c	Mon Jun 25 21:33:17 2012	(r238287)
+++ soc2012/jhagewood/diff/diff/diff.c	Mon Jun 25 21:52:47 2012	(r238288)
@@ -312,7 +312,7 @@
 			format = D_NORMAL;
 			break;
 		case OPT_SUPCL:
-			suppress_cl = 1;
+			/* Do nothing, passes option to sdiff. */
 			break;
 		case OPT_TSIZE:
 			if (optarg != NULL) {

Modified: soc2012/jhagewood/diff/hagewood-diff.patch
==============================================================================
--- soc2012/jhagewood/diff/hagewood-diff.patch	Mon Jun 25 21:33:17 2012	(r238287)
+++ soc2012/jhagewood/diff/hagewood-diff.patch	Mon Jun 25 21:52:47 2012	(r238288)
@@ -1,6 +1,6 @@
 diff -rupN jhagewood/diff/diff-orig/diff.c jhagewood/diff/diff/diff.c
 --- jhagewood/diff/diff-orig/diff.c	2012-06-25 16:05:53.000000000 -0400
-+++ jhagewood/diff/diff/diff.c	2012-06-25 16:05:53.000000000 -0400
++++ jhagewood/diff/diff/diff.c	2012-06-25 21:52:27.000000000 -0400
 @@ -1,4 +1,4 @@
 -/*-
 +/*
@@ -229,7 +229,7 @@
 +			format = D_NORMAL;
 +			break;
 +		case OPT_SUPCL:
-+			suppress_cl = 1;
++			/* Do nothing, passes option to sdiff. */
 +			break;
  		case OPT_TSIZE:
 -                        if (optarg != NULL) {