1 files changed, 3 insertions, 3 deletions

diff --git a/contrib/cvs/diff/diff3.c b/contrib/cvs/diff/diff3.c
index 4a6fba618c238..6de8c81cbc4d8 100644
--- a/contrib/cvs/diff/diff3.c
+++ b/contrib/cvs/diff/diff3.c
@@ -444,7 +444,7 @@ diff3_run (argc, argv, out, callbacks_arg)
 	  outfile = fopen (out, "w");
 	  if (outfile == NULL)
 	    {
-	      perror_with_name ("could not open output file");
+	      perror_with_name (out);
 	      return 2;
 	    }
 	  opened_file = 1;
@@ -1847,10 +1847,10 @@ myread (fd, ptr, size)
      char *ptr;
      size_t size;
 {
-  size_t result = read (fd, ptr, size);
+  ssize_t result = read (fd, ptr, size);
   if (result == -1)
     diff3_perror_with_exit ("read failed");
-  return result;
+  return (size_t)result;
 }
 
 static void