From owner-svn-soc-all@FreeBSD.ORG  Mon Jul  2 16:35:04 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 1BB421065676
	for <svn-soc-all@FreeBSD.org>; Mon,  2 Jul 2012 16:35:02 +0000 (UTC)
	(envelope-from jhagewood@FreeBSD.org)
Received: by socsvn.FreeBSD.org (sSMTP sendmail emulation);
	Mon, 02 Jul 2012 16:35:02 +0000
Date: Mon, 02 Jul 2012 16:35:02 +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: <20120702163502.1BB421065676@hub.freebsd.org>
Cc: 
Subject: socsvn commit: r238816 - in soc2012/jhagewood/sdiff: . sdiff
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, 02 Jul 2012 16:35:04 -0000

Author: jhagewood
Date: Mon Jul  2 16:35:01 2012
New Revision: 238816
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=238816

Log:

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

Modified: soc2012/jhagewood/sdiff/hagewood-sdiff.patch
==============================================================================
--- soc2012/jhagewood/sdiff/hagewood-sdiff.patch	Mon Jul  2 16:24:17 2012	(r238815)
+++ soc2012/jhagewood/sdiff/hagewood-sdiff.patch	Mon Jul  2 16:35:01 2012	(r238816)
@@ -1,6 +1,6 @@
 diff -rupN jhagewood/sdiff/sdiff-orig/sdiff.c jhagewood/sdiff/sdiff/sdiff.c
 --- jhagewood/sdiff/sdiff-orig/sdiff.c	2012-07-02 15:05:58.000000000 -0400
-+++ jhagewood/sdiff/sdiff/sdiff.c	2012-07-02 16:08:17.000000000 -0400
++++ jhagewood/sdiff/sdiff/sdiff.c	2012-07-02 16:34:59.000000000 -0400
 @@ -101,7 +101,8 @@ enum {
        HLINES_OPT,
        LFILES_OPT,
@@ -11,15 +11,6 @@
  /* pid from the diff parent (if applicable) */
        DIFF_PID,
        
-@@ -474,7 +475,7 @@ printcol(const char *s, size_t *col, con
- 				return;
- 
- 			/* Round to next multiple of eight. */
--			new_col = (*col / 8 + 1) * 8;
-+			new_col = (*col / 8 +1) * 8;
- 
- 			/*
- 			 * If printing the tab goes past the column
 @@ -604,7 +605,7 @@ println(const char *s1, const char div, 
  	}
  

Modified: soc2012/jhagewood/sdiff/sdiff/sdiff.c
==============================================================================
--- soc2012/jhagewood/sdiff/sdiff/sdiff.c	Mon Jul  2 16:24:17 2012	(r238815)
+++ soc2012/jhagewood/sdiff/sdiff/sdiff.c	Mon Jul  2 16:35:01 2012	(r238816)
@@ -475,7 +475,7 @@
 				return;
 
 			/* Round to next multiple of eight. */
-			new_col = (*col / 8 +1) * 8;
+			new_col = (*col / 8 + 1) * 8;
 
 			/*
 			 * If printing the tab goes past the column