generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ifdef cleanup, 2 remove OPENSSL_NO_SETVBUF_IONBF

Browse Source 
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>
This commit is contained in:
Rich Salz
2015-01-22 12:57:29 -05:00
parent 9c46f4b9cd
commit 27c7609cf8
5 changed files with 7 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
apps/enc.c
View File

@@ -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());