diff options
| author | Rich Salz <rsalz@openssl.org> | 2015-01-22 12:57:29 -0500 |
|---|---|---|
| committer | Rich Salz <rsalz@openssl.org> | 2015-01-22 12:57:29 -0500 |
| commit | 27c7609cf8e72dfa2956bc00f166301ee983581a (patch) | |
| tree | 300e053981fbd86cfb008e0606aa044bc275a2cd /apps/enc.c | |
| parent | 9c46f4b9cd4912b61cb546c48b678488d7f26ed6 (diff) | |
ifdef cleanup, 2 remove OPENSSL_NO_SETVBUF_IONBF
Use setbuf(fp, NULL) instead of setvbuf(). This removes some
ifdef complexity because all of our platforms support setbuf.
Reviewed-by: Richard Levitte <levitte@openssl.org>
Diffstat (limited to 'apps/enc.c')
| -rw-r--r-- | apps/enc.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/apps/enc.c b/apps/enc.c index 8334f39284..3bf4a6eb04 100644 --- a/apps/enc.c +++ b/apps/enc.c @@ -396,10 +396,8 @@ int MAIN(int argc, char **argv) } if (inf == NULL) { -#ifndef OPENSSL_NO_SETVBUF_IONBF if (bufsize != NULL) - setvbuf(stdin, (char *)NULL, _IONBF, 0); -#endif /* ndef OPENSSL_NO_SETVBUF_IONBF */ + setbuf(stdin, NULL); BIO_set_fp(in, stdin, BIO_NOCLOSE); } else { if (BIO_read_filename(in, inf) <= 0) { @@ -442,10 +440,8 @@ int MAIN(int argc, char **argv) if (outf == NULL) { BIO_set_fp(out, stdout, BIO_NOCLOSE); -#ifndef OPENSSL_NO_SETVBUF_IONBF if (bufsize != NULL) - setvbuf(stdout, (char *)NULL, _IONBF, 0); -#endif /* ndef OPENSSL_NO_SETVBUF_IONBF */ + setbuf(stdin, NULL); /* don't do buffered reads */ #ifdef OPENSSL_SYS_VMS { BIO *tmpbio = BIO_new(BIO_f_linebuffer()); |