From 8df8fc83d5a130e56bfd4451997af2cb1e451318 Mon Sep 17 00:00:00 2001 From: Peter Wemm Date: Mon, 2 Sep 2002 05:57:14 +0000 Subject: Initial merge of 1.11.1p1 -> 1.11.2 changes onto mainline --- 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 dc896062c6ae..fc32abd8006e 100644 --- a/contrib/cvs/diff/diff3.c +++ b/contrib/cvs/diff/diff3.c @@ -447,7 +447,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; @@ -1850,10 +1850,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.2.3