diff options
author | joerg <joerg@FreeBSD.org> | 1995-03-19 13:29:28 +0000 |
---|---|---|
committer | joerg <joerg@FreeBSD.org> | 1995-03-19 13:29:28 +0000 |
commit | c6030c6511c69b69a216c893957b01bfc264d365 (patch) | |
tree | 163891f0a6f18e48e3d38e4d107ad82c2f5c570a /bin/ed/io.c | |
parent | 568f2efc88b72b511e26d42250ac4250a6610415 (diff) | |
download | FreeBSD-src-c6030c6511c69b69a216c893957b01bfc264d365.zip FreeBSD-src-c6030c6511c69b69a216c893957b01bfc264d365.tar.gz |
You will find enclosed some changes to make gcc -Wall more happy in
/usr/src/bin. Note that some patches are still needed in that directory.
I (Joerg) finished most of Philippe's cleanup. /bin/sh will still
need *allot* of work, however.
Submitted by: charnier@lirmm.fr (Philippe Charnier)
Diffstat (limited to 'bin/ed/io.c')
-rw-r--r-- | bin/ed/io.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/bin/ed/io.c b/bin/ed/io.c index 0c98504c..1072d06 100644 --- a/bin/ed/io.c +++ b/bin/ed/io.c @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id$ + * $Id: io.c,v 1.3 1994/09/24 02:55:27 davidg Exp $ */ #ifndef lint @@ -106,7 +106,7 @@ read_stream(fp, n) return ERR; if (appended && size && o_isbinary && o_newline_added) fputs("newline inserted\n", stderr); - else if (newline_added && (!appended || !isbinary && !o_isbinary)) + else if (newline_added && (!appended || (!isbinary && !o_isbinary))) fputs("newline appended\n", stderr); if (isbinary && newline_added && !appended) size += 1; @@ -128,8 +128,8 @@ get_stream_line(fp) register int c; register int i = 0; - while (((c = des ? get_des_char(fp) : getc(fp)) != EOF || !feof(fp) && - !ferror(fp)) && c != '\n') { + while (((c = des ? get_des_char(fp) : getc(fp)) != EOF || (!feof(fp) && + !ferror(fp))) && c != '\n') { REALLOC(sbuf, sbufsz, i + 1, ERR); if (!(sbuf[i++] = c)) isbinary = 1; |