diff options
Diffstat (limited to 'contrib/cvs/diff/diff3.c')
| -rw-r--r-- | contrib/cvs/diff/diff3.c | 6 |
1 files changed, 3 insertions, 3 deletions
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 |