CVS commit: src/external/gpl2/xcvs/dist/diff

2012-03-08 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Thu Mar  8 20:50:47 UTC 2012

Modified Files:
src/external/gpl2/xcvs/dist/diff: diff3.c

Log Message:
fix format string


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/gpl2/xcvs/dist/diff/diff3.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/gpl2/xcvs/dist/diff/diff3.c
diff -u src/external/gpl2/xcvs/dist/diff/diff3.c:1.2 src/external/gpl2/xcvs/dist/diff/diff3.c:1.3
--- src/external/gpl2/xcvs/dist/diff/diff3.c:1.2	Fri Jan  6 10:16:02 2012
+++ src/external/gpl2/xcvs/dist/diff/diff3.c	Thu Mar  8 15:50:46 2012
@@ -1503,7 +1503,7 @@ output_diff3 (diff, mapping, rev_mapping
 	  line = 0;
 	  do
 		{
-		  printf_output (line_prefix);
+		  printf_output ("%s", line_prefix);
 		  cp = D_RELNUM (ptr, realfile, line);
 		  length = D_RELLEN (ptr, realfile, line);
 		  write_output (cp, length);



CVS commit: src/external/gpl2/xcvs/dist/diff

2012-03-08 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Thu Mar  8 20:50:55 UTC 2012

Modified Files:
src/external/gpl2/xcvs/dist/diff: util.c

Log Message:
prefer NULL over 0


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 src/external/gpl2/xcvs/dist/diff/util.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/gpl2/xcvs/dist/diff/util.c
diff -u src/external/gpl2/xcvs/dist/diff/util.c:1.1.1.1 src/external/gpl2/xcvs/dist/diff/util.c:1.2
--- src/external/gpl2/xcvs/dist/diff/util.c:1.1.1.1	Tue Apr  7 18:10:11 2009
+++ src/external/gpl2/xcvs/dist/diff/util.c	Thu Mar  8 15:50:55 2012
@@ -235,7 +235,7 @@ begin_output ()
 	  close (pipes[0]);
 	}
 
-	  execl (PR_PROGRAM, PR_PROGRAM, "-f", "-h", name, 0);
+	  execl (PR_PROGRAM, PR_PROGRAM, "-f", "-h", name, NULL);
 	  pfatal_with_name (PR_PROGRAM);
 	}
   else