socsvn commit: r237160 - in soc2012/jhagewood/diff3: . diff3
jhagewood at FreeBSD.org
jhagewood at FreeBSD.org
Tue Jun 5 20:14:05 UTC 2012
Author: jhagewood
Date: Tue Jun 5 20:14:03 2012
New Revision: 237160
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=237160
Log:
Modified:
soc2012/jhagewood/diff3/diff3/diff3prog.c
soc2012/jhagewood/diff3/hagewood-diff3.patch
Modified: soc2012/jhagewood/diff3/diff3/diff3prog.c
==============================================================================
--- soc2012/jhagewood/diff3/diff3/diff3prog.c Tue Jun 5 20:13:02 2012 (r237159)
+++ soc2012/jhagewood/diff3/diff3/diff3prog.c Tue Jun 5 20:14:03 2012 (r237160)
@@ -625,7 +625,8 @@
(void)fseek(fp[i], (long)-nchar, SEEK_CUR);
}
-/* If file has trailing carriage return, remove it.
+/*
+ * If file has trailing carriage return, remove it.
*/
void
remove_cr(FILE *f) {
Modified: soc2012/jhagewood/diff3/hagewood-diff3.patch
==============================================================================
--- soc2012/jhagewood/diff3/hagewood-diff3.patch Tue Jun 5 20:13:02 2012 (r237159)
+++ soc2012/jhagewood/diff3/hagewood-diff3.patch Tue Jun 5 20:14:03 2012 (r237160)
@@ -11,7 +11,7 @@
.include <bsd.prog.mk>
diff -rupN jhagewood/diff3/diff3-orig/diff3prog.c jhagewood/diff3/diff3/diff3prog.c
--- jhagewood/diff3/diff3-orig/diff3prog.c 2012-06-04 23:30:11.000000000 -0400
-+++ jhagewood/diff3/diff3/diff3prog.c 2012-06-05 20:10:22.000000000 -0400
++++ jhagewood/diff3/diff3/diff3prog.c 2012-06-05 20:13:52.000000000 -0400
@@ -82,6 +82,9 @@
/* diff3 - 3-way differential file comparison */
@@ -110,11 +110,12 @@
}
merge(m, n);
exit(EXIT_SUCCESS);
-@@ -606,6 +625,31 @@ repos(int nchar)
+@@ -606,6 +625,32 @@ repos(int nchar)
(void)fseek(fp[i], (long)-nchar, SEEK_CUR);
}
-+/* If file has trailing carriage return, remove it.
++/*
++ * If file has trailing carriage return, remove it.
+ */
+void
+remove_cr(FILE *f) {
@@ -142,7 +143,7 @@
__dead void
trouble(void)
{
-@@ -699,12 +743,38 @@ increase(void)
+@@ -699,12 +744,38 @@ increase(void)
}
More information about the svn-soc-all
mailing list