diff options
| author | peter <peter@FreeBSD.org> | 2002-09-02 05:57:14 +0000 |
|---|---|---|
| committer | peter <peter@FreeBSD.org> | 2002-09-02 05:57:14 +0000 |
| commit | a2b6a3a9b8cf8113c377699deba118c6b57d881e (patch) | |
| tree | 32949f652e8da27bbd93bd53f3dc7bca126e7e9e /contrib/cvs/diff/diff3.c | |
| parent | 9977823bcf0469bcd2b9a4a936f590610431dc1e (diff) | |
| download | FreeBSD-src-a2b6a3a9b8cf8113c377699deba118c6b57d881e.zip FreeBSD-src-a2b6a3a9b8cf8113c377699deba118c6b57d881e.tar.gz | |
Initial merge of 1.11.1p1 -> 1.11.2 changes onto mainline
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 dc89606..fc32abd 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 |
