socsvn commit: r238816 - in soc2012/jhagewood/sdiff: . sdiff

[jhagewood at FreeBSD.org]

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