diff options
| author | peter <peter@FreeBSD.org> | 2002-09-02 05:50:28 +0000 |
|---|---|---|
| committer | peter <peter@FreeBSD.org> | 2002-09-02 05:50:28 +0000 |
| commit | cf46dfb750863d760d19b9858b0a336b158275da (patch) | |
| tree | 8440832ece5130fad994f5f3489b01676ab1ca4a /contrib/cvs/diff/diff3.c | |
| parent | 92c0df1bed708821e09e92931a5309cd3abd82fb (diff) | |
| download | FreeBSD-src-cf46dfb750863d760d19b9858b0a336b158275da.zip FreeBSD-src-cf46dfb750863d760d19b9858b0a336b158275da.tar.gz | |
Import cvs-1.11.2 onto vendor branch
Obtained from: http://www.cvshome.org/
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 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 |
