socsvn commit: r237579 - in soc2012/jhagewood/diff3: . diff3

jhagewood at FreeBSD.org jhagewood at FreeBSD.org
Wed Jun 13 03:11:59 UTC 2012


Author: jhagewood
Date: Wed Jun 13 03:11:56 2012
New Revision: 237579
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=237579

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	Wed Jun 13 03:07:07 2012	(r237578)
+++ soc2012/jhagewood/diff3/diff3/diff3prog.c	Wed Jun 13 03:11:56 2012	(r237579)
@@ -483,8 +483,8 @@
 static int
 asciifile(FILE *f)
 {
-	wint_t   ch = L'\0';
-	size_t   i;
+	wint_t ch = L'\0';
+	size_t i;
 
 	if (aflag || f == NULL)
 		return(1);
@@ -590,7 +590,7 @@
 int
 duplicate(struct range *r1, struct range *r2)
 {
-	int c,d;
+	int c, d;
 	int nchar;
 	int nline;
 
@@ -679,7 +679,7 @@
 __dead void
 edscript(int n)
 {
-	int j,k;
+	int j, k;
 	char block[BUFSIZ];
 
 	for (n = n; n > 0; n--) {

Modified: soc2012/jhagewood/diff3/hagewood-diff3.patch
==============================================================================
--- soc2012/jhagewood/diff3/hagewood-diff3.patch	Wed Jun 13 03:07:07 2012	(r237578)
+++ soc2012/jhagewood/diff3/hagewood-diff3.patch	Wed Jun 13 03:11:56 2012	(r237579)
@@ -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-10 03:31:05.000000000 -0400
-+++ jhagewood/diff3/diff3/diff3prog.c	2012-06-13 03:04:38.000000000 -0400
++++ jhagewood/diff3/diff3/diff3prog.c	2012-06-13 03:11:53.000000000 -0400
 @@ -64,22 +64,31 @@
   *	@(#)diff3.c	8.1 (Berkeley) 6/6/93
   */
@@ -223,8 +223,8 @@
 -
 -        if (aflag || f == NULL)
 -                return (1);
-+	wint_t   ch = L'\0';
-+	size_t   i;
++	wint_t ch = L'\0';
++	size_t i;
  
 -        rewind(f);
 -        errno = 0;
@@ -298,7 +298,13 @@
  }
  
  /*
-@@ -576,7 +595,7 @@ duplicate(struct range *r1, struct range
+@@ -571,12 +590,12 @@ skip(int i, int from, char *pr)
+ int
+ duplicate(struct range *r1, struct range *r2)
+ {
+-	int c,d;
++	int c, d;
+ 	int nchar;
  	int nline;
  
  	if (r1->to-r1->from != r2->to-r2->from)
@@ -367,7 +373,7 @@
  	j++;
  	overlap[j] = !dup;
  	if (!dup)
-@@ -628,7 +672,7 @@ edit(struct diff *diff, int dup, int j)
+@@ -628,14 +672,14 @@ edit(struct diff *diff, int dup, int j)
  	de[j].old.to = diff->old.to;
  	de[j].new.from = de[j-1].new.to + skip(2, diff->new.from, NULL);
  	de[j].new.to = de[j].new.from + skip(2, diff->new.to, NULL);
@@ -376,6 +382,14 @@
  }
  
  /* regurgitate */
+ __dead void
+ edscript(int n)
+ {
+-	int j,k;
++	int j, k;
+ 	char block[BUFSIZ];
+ 
+ 	for (n = n; n > 0; n--) {
 @@ -657,7 +701,6 @@ edscript(int n)
  			printf("%da\n%s\n.\n", de[n].old.from - 1, f1mark);
  		}


More information about the svn-soc-all mailing list