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

[jhagewood at FreeBSD.org]

Author: jhagewood
Date: Sat Jul  7 01:10:59 2012
New Revision: 239062
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=239062

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	Sat Jul  7 01:07:58 2012	(r239061)
+++ soc2012/jhagewood/sdiff/hagewood-sdiff.patch	Sat Jul  7 01:10:59 2012	(r239062)
@@ -12,7 +12,7 @@
  .Sh NAME
 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-07 01:03:06.000000000 -0400
++++ jhagewood/sdiff/sdiff/sdiff.c	2012-07-07 01:10:58.000000000 -0400
 @@ -101,7 +101,8 @@ enum {
        HLINES_OPT,
        LFILES_OPT,
@@ -196,7 +196,29 @@
  		case 'r':
  		case '2':
  			/* Choose right column as-is. */
-@@ -1117,10 +1127,8 @@ int_usage(void)
+@@ -1103,24 +1113,22 @@ printd(FILE *file1, size_t file1end)
+ static void
+ int_usage(void)
+ {
+-	puts("e:\tedit blank diff\n"
+-	    "eb:\tedit both diffs concatenated\n"
+-	    "el:\tedit left diff\n"
+-	    "er:\tedit right diff\n"
+-	    "l | 1:\tchoose left diff\n"
+-	    "r | 2:\tchoose right diff\n"
+-	    "s:\tsilent mode--don't print identical lines\n"
+-	    "v:\tverbose mode--print identical lines\n"
++	printf("%s", "e:\tedit blank diff\n",
++	    "eb:\tedit both diffs concatenated\n",
++	    "el:\tedit left diff\n",
++	    "er:\tedit right diff\n",
++	    "l | 1:\tchoose left diff\n",
++	    "r | 2:\tchoose right diff\n",
++	    "s:\tsilent mode--don't print identical lines\n",
++	    "v:\tverbose mode--print identical lines\n",
+ 	    "q:\tquit");
+ }
+ 
  static void
  usage(void)
  {

Modified: soc2012/jhagewood/sdiff/sdiff/sdiff.c
==============================================================================
--- soc2012/jhagewood/sdiff/sdiff/sdiff.c	Sat Jul  7 01:07:58 2012	(r239061)
+++ soc2012/jhagewood/sdiff/sdiff/sdiff.c	Sat Jul  7 01:10:59 2012	(r239062)
@@ -1113,14 +1113,14 @@
 static void
 int_usage(void)
 {
-	puts("e:\tedit blank diff\n"
-	    "eb:\tedit both diffs concatenated\n"
-	    "el:\tedit left diff\n"
-	    "er:\tedit right diff\n"
-	    "l | 1:\tchoose left diff\n"
-	    "r | 2:\tchoose right diff\n"
-	    "s:\tsilent mode--don't print identical lines\n"
-	    "v:\tverbose mode--print identical lines\n"
+	printf("%s", "e:\tedit blank diff\n",
+	    "eb:\tedit both diffs concatenated\n",
+	    "el:\tedit left diff\n",
+	    "er:\tedit right diff\n",
+	    "l | 1:\tchoose left diff\n",
+	    "r | 2:\tchoose right diff\n",
+	    "s:\tsilent mode--don't print identical lines\n",
+	    "v:\tverbose mode--print identical lines\n",
 	    "q:\tquit");
 }