diff options
| author | Xavier Santolaria <xsa@cvs.openbsd.org> | 2006-03-23 08:50:42 +0000 |
|---|---|---|
| committer | Xavier Santolaria <xsa@cvs.openbsd.org> | 2006-03-23 08:50:42 +0000 |
| commit | 773d0e6e50114e5b11d6098c4bcc5e8d3b901e04 (patch) | |
| tree | 836744a2ed6f61a9ce3bdaffef0d733abf19f5b6 /usr.bin/rcs | |
| parent | 16169beb365d63140b6de93016940fa6650456a5 (diff) | |
- cvs_buf_putc() will never return non-zero
- change cvs_buf_putc() return type to void
OK ray@.
Diffstat (limited to 'usr.bin/rcs')
| -rw-r--r-- | usr.bin/rcs/ci.c | 20 | ||||
| -rw-r--r-- | usr.bin/rcs/rcsmerge.c | 8 |
2 files changed, 6 insertions, 22 deletions
diff --git a/usr.bin/rcs/ci.c b/usr.bin/rcs/ci.c index 4ac206fa4d2..5dcad5bc3f3 100644 --- a/usr.bin/rcs/ci.c +++ b/usr.bin/rcs/ci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ci.c,v 1.123 2006/03/20 16:18:13 niallo Exp $ */ +/* $OpenBSD: ci.c,v 1.124 2006/03/23 08:50:41 xsa Exp $ */ /* * Copyright (c) 2005, 2006 Niall O'Higgins <niallo@openbsd.org> * All rights reserved. @@ -518,11 +518,7 @@ checkin_update(struct checkin_params *pb) return (-1); } - if (cvs_buf_putc(bp, '\0') < 0) { - rcs_close(pb->file); - return (-1); - } - + cvs_buf_putc(bp, '\0'); filec = (char *)cvs_buf_release(bp); /* Get RCS patch */ @@ -636,11 +632,7 @@ checkin_init(struct checkin_params *pb) return (-1); } - if (cvs_buf_putc(bp, '\0') < 0) { - rcs_close(pb->file); - return (-1); - } - + cvs_buf_putc(bp, '\0'); filec = (char *)cvs_buf_release(bp); /* Get default values from working copy if -k specified */ @@ -665,11 +657,7 @@ checkin_init(struct checkin_params *pb) rcs_close(pb->file); return (-1); } - if (cvs_buf_putc(dp, '\0') < 0) { - xfree(filec); - rcs_close(pb->file); - return (-1); - } + cvs_buf_putc(dp, '\0'); rcs_desc = (const char *)cvs_buf_release(dp); } } diff --git a/usr.bin/rcs/rcsmerge.c b/usr.bin/rcs/rcsmerge.c index 830cb848121..54f90713566 100644 --- a/usr.bin/rcs/rcsmerge.c +++ b/usr.bin/rcs/rcsmerge.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rcsmerge.c,v 1.21 2006/03/16 04:04:57 ray Exp $ */ +/* $OpenBSD: rcsmerge.c,v 1.22 2006/03/23 08:50:41 xsa Exp $ */ /* * Copyright (c) 2005, 2006 Xavier Santolaria <xsa@openbsd.org> * All rights reserved. @@ -142,11 +142,7 @@ rcsmerge_main(int argc, char **argv) } if (pipeout == 1) { - if (cvs_buf_putc(bp, '\0') < 0) { - rcs_close(file); - continue; - } - + cvs_buf_putc(bp, '\0'); fcont = cvs_buf_release(bp); printf("%s", fcont); xfree(fcont); |