From cf46dfb750863d760d19b9858b0a336b158275da Mon Sep 17 00:00:00 2001 From: peter Date: Mon, 2 Sep 2002 05:50:28 +0000 Subject: Import cvs-1.11.2 onto vendor branch Obtained from: http://www.cvshome.org/ --- contrib/cvs/diff/diff3.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'contrib/cvs/diff/diff3.c') diff --git a/contrib/cvs/diff/diff3.c b/contrib/cvs/diff/diff3.c index 4a6fba6..6de8c81 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 -- cgit v1.1