diff options
Diffstat (limited to 'contrib/cvs/diff/diff3.c')
| -rw-r--r-- | contrib/cvs/diff/diff3.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/contrib/cvs/diff/diff3.c b/contrib/cvs/diff/diff3.c index 6de8c81cbc4d..dc896062c6ae 100644 --- a/contrib/cvs/diff/diff3.c +++ b/contrib/cvs/diff/diff3.c @@ -12,6 +12,9 @@ GNU General Public License for more details. */ +/* + * $FreeBSD$ + */ /* Written by Randy Smith */ /* Librarification by Tim Pierce */ @@ -444,7 +447,7 @@ diff3_run (argc, argv, out, callbacks_arg) outfile = fopen (out, "w"); if (outfile == NULL) { - perror_with_name (out); + perror_with_name ("could not open output file"); return 2; } opened_file = 1; @@ -1847,10 +1850,10 @@ myread (fd, ptr, size) char *ptr; size_t size; { - ssize_t result = read (fd, ptr, size); + size_t result = read (fd, ptr, size); if (result == -1) diff3_perror_with_exit ("read failed"); - return (size_t)result; + return result; } static void |