diff options
author | Rich Salz <rsalz@openssl.org> | 2015-02-06 10:54:20 -0500 |
---|---|---|
committer | Rich Salz <rsalz@openssl.org> | 2015-02-06 10:54:20 -0500 |
commit | 6f91b017bbb7140f816721141ac156d1b828a6b3 (patch) | |
tree | e77196a270e92d461ab7193f0fdcf60d337918c7 /crypto/bio/bf_nbio.c | |
parent | 9e9858d1cf28e39cfd214b5c508188d5016728fd (diff) | |
download | openssl-6f91b017bbb7140f816721141ac156d1b828a6b3.tar.gz |
Live code cleanup: remove #if 1 stuff
For code bracketed by "#if 1" then remove the alternate
"#else .. #endif" lines.
Reviewed-by: Andy Polyakov <appro@openssl.org>
Diffstat (limited to 'crypto/bio/bf_nbio.c')
-rw-r--r-- | crypto/bio/bf_nbio.c | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/crypto/bio/bf_nbio.c b/crypto/bio/bf_nbio.c index da88a8a1bf..3af58bd38f 100644 --- a/crypto/bio/bf_nbio.c +++ b/crypto/bio/bf_nbio.c @@ -127,10 +127,8 @@ static int nbiof_free(BIO *a) static int nbiof_read(BIO *b, char *out, int outl) { int ret = 0; -#if 1 int num; unsigned char n; -#endif if (out == NULL) return (0); @@ -138,7 +136,6 @@ static int nbiof_read(BIO *b, char *out, int outl) return (0); BIO_clear_retry_flags(b); -#if 1 RAND_pseudo_bytes(&n, 1); num = (n & 0x07); @@ -148,9 +145,7 @@ static int nbiof_read(BIO *b, char *out, int outl) if (num == 0) { ret = -1; BIO_set_retry_read(b); - } else -#endif - { + } else { ret = BIO_read(b->next_bio, out, outl); if (ret < 0) BIO_copy_next_retry(b); @@ -173,7 +168,6 @@ static int nbiof_write(BIO *b, const char *in, int inl) BIO_clear_retry_flags(b); -#if 1 if (nt->lwn > 0) { num = nt->lwn; nt->lwn = 0; @@ -188,9 +182,7 @@ static int nbiof_write(BIO *b, const char *in, int inl) if (num == 0) { ret = -1; BIO_set_retry_write(b); - } else -#endif - { + } else { ret = BIO_write(b->next_bio, in, inl); if (ret < 0) { BIO_copy_next_retry(b); |