diff options
| author | Joris Vink <joris@cvs.openbsd.org> | 2008-03-08 11:53:37 +0000 |
|---|---|---|
| committer | Joris Vink <joris@cvs.openbsd.org> | 2008-03-08 11:53:37 +0000 |
| commit | c3024e8f3379a5e1412f0f9158857dee595417a2 (patch) | |
| tree | c357e02c79c31584dfed4b64f88930c84b0f4d01 /usr.bin/cvs/diff3.c | |
| parent | 9a664b1bab7e8a1315c8c320f4bd2128933c7f22 (diff) | |
correct usage of lseek(2);
Diffstat (limited to 'usr.bin/cvs/diff3.c')
| -rw-r--r-- | usr.bin/cvs/diff3.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/usr.bin/cvs/diff3.c b/usr.bin/cvs/diff3.c index adfb540da98..f98c55e4584 100644 --- a/usr.bin/cvs/diff3.c +++ b/usr.bin/cvs/diff3.c @@ -1,4 +1,4 @@ -/* $OpenBSD: diff3.c,v 1.45 2008/03/01 14:40:23 joris Exp $ */ +/* $OpenBSD: diff3.c,v 1.46 2008/03/08 11:53:36 joris Exp $ */ /* * Copyright (C) Caldera International Inc. 2001-2002. @@ -72,7 +72,7 @@ static const char copyright[] = #ifndef lint static const char rcsid[] = - "$OpenBSD: diff3.c,v 1.45 2008/03/01 14:40:23 joris Exp $"; + "$OpenBSD: diff3.c,v 1.46 2008/03/08 11:53:36 joris Exp $"; #endif /* not lint */ #include <ctype.h> @@ -216,11 +216,11 @@ cvs_merge_file(struct cvs_file *cf, int verbose) argv[argc++] = path2; argv[argc++] = path3; - if (lseek(fds[2], SEEK_SET, 0) < 0) + if (lseek(fds[2], 0, SEEK_SET) < 0) fatal("cvs_merge_file: lseek fds[2]: %s", strerror(errno)); - if (lseek(fds[3], SEEK_SET, 0) < 0) + if (lseek(fds[3], 0, SEEK_SET) < 0) fatal("cvs_merge_file: lseek fds[3]: %s", strerror(errno)); - if (lseek(fds[4], SEEK_SET, 0) < 0) + if (lseek(fds[4], 0, SEEK_SET) < 0) fatal("cvs_merge_file: lseek fds[4]: %s", strerror(errno)); diff3_conflicts = diff3_internal(argc, argv, cf->file_path, r2); |