--- cvs-1.11.23/diff/diff3.c
+++ cvs-1.11.23/diff/diff3.c
@@ -1517,7 +1517,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-1.11.23/src/main.c
+++ cvs-1.11.23/src/main.c
@@ -1140,6 +1140,6 @@ usage (cpp)
 {
     (void) fprintf (stderr, *cpp++, program_name, cvs_cmd_name);
     for (; *cpp; cpp++)
-	(void) fprintf (stderr, *cpp);
+	(void) fputs (*cpp, stderr);
     error_exit ();
 }
--- cvs-1.11.23/src/subr.c
+++ cvs-1.11.23/src/subr.c
@@ -57,7 +57,7 @@ xmalloc (bytes)
 	char buf[80];
 	sprintf (buf, "cannot allocate %lu bytes: out of memory",
 		 (unsigned long) bytes);
-	error (1, 0, buf);
+	error (1, 0, "%s", buf);
     }
     return (cp);
 }
@@ -79,7 +79,7 @@ xrealloc (ptr, bytes)
 	char buf[80];
 	sprintf (buf, "can not reallocate %lu bytes: out of memory",
 		 (unsigned long) bytes);
-	error (1, 0, buf);
+	error (1, 0, "%s", buf);
     }
     return (cp);
 }