diff options
author | Matt Caswell <matt@openssl.org> | 2015-01-05 00:34:00 +0000 |
---|---|---|
committer | Matt Caswell <matt@openssl.org> | 2015-01-22 09:48:59 +0000 |
commit | 564ccc55d6463e485f885a8c2192121ea8fe6adf (patch) | |
tree | de073a7f21239041a5b23820a91515e87abb89f2 /crypto/bio | |
parent | b558c8d59782dab2809a1530cbbcd9f38785302b (diff) |
Further comment amendments to preserve formatting prior to source reformat
(cherry picked from commit 4a7fa26ffd65bf36beb8d1cb8f29fc0ae203f5c5)
Conflicts:
crypto/x509v3/pcy_tree.c
Conflicts:
apps/apps.c
ssl/ssltest.c
Conflicts:
apps/apps.c
crypto/ec/ec2_oct.c
crypto/ec/ecp_nistp224.c
crypto/ec/ecp_nistp256.c
crypto/ec/ecp_nistp521.c
ssl/s3_cbc.c
ssl/ssl_sess.c
ssl/t1_lib.c
Conflicts:
crypto/bio/b_sock.c
crypto/pem/pem.h
crypto/x509/x509_vfy.c
crypto/x509v3/pcy_tree.c
ssl/s3_both.c
Reviewed-by: Tim Hudson <tjh@openssl.org>
Diffstat (limited to 'crypto/bio')
-rw-r--r-- | crypto/bio/bf_null.c | 6 | ||||
-rw-r--r-- | crypto/bio/bss_rtcp.c | 3 |
2 files changed, 6 insertions, 3 deletions
diff --git a/crypto/bio/bf_null.c b/crypto/bio/bf_null.c index c1bf39a904..e179e6d0f5 100644 --- a/crypto/bio/bf_null.c +++ b/crypto/bio/bf_null.c @@ -102,9 +102,11 @@ static int nullf_new(BIO *bi) static int nullf_free(BIO *a) { if (a == NULL) return(0); -/* a->ptr=NULL; + /*- + a->ptr=NULL; a->init=0; - a->flags=0;*/ + a->flags=0; + */ return(1); } diff --git a/crypto/bio/bss_rtcp.c b/crypto/bio/bss_rtcp.c index 7dae485564..dd6038f3bd 100644 --- a/crypto/bio/bss_rtcp.c +++ b/crypto/bio/bss_rtcp.c @@ -56,7 +56,8 @@ * [including the GNU Public Licence.] */ -/* Written by David L. Jones <jonesd@kcgl1.eng.ohio-state.edu> +/*- + * Written by David L. Jones <jonesd@kcgl1.eng.ohio-state.edu> * Date: 22-JUL-1996 * Revised: 25-SEP-1997 Update for 0.8.1, BIO_CTRL_SET -> BIO_C_SET_FD */ |