summaryrefslogtreecommitdiffstats
path: root/crypto/bio
diff options
context:
space:
mode:
authorMatt Caswell <matt@openssl.org>2015-01-05 00:34:00 +0000
committerMatt Caswell <matt@openssl.org>2015-01-22 09:23:50 +0000
commite19d4a99b8f25456dfab7086af57f3f208cdfed6 (patch)
treecd7931e89476c762982afdc5585aa942ad0a4f0b /crypto/bio
parent6977c7e2baf291278aee7632f1a68581b7c4d1f9 (diff)
Further comment amendments to preserve formatting prior to source reformat
(cherry picked from commit 4a7fa26ffd65bf36beb8d1cb8f29fc0ae203f5c5) Conflicts: crypto/x509v3/pcy_tree.c Reviewed-by: Tim Hudson <tjh@openssl.org>
Diffstat (limited to 'crypto/bio')
-rw-r--r--crypto/bio/b_sock.c3
-rw-r--r--crypto/bio/bf_null.c6
-rw-r--r--crypto/bio/bss_rtcp.c3
3 files changed, 8 insertions, 4 deletions
diff --git a/crypto/bio/b_sock.c b/crypto/bio/b_sock.c
index a026b3e0b0..445d900cbc 100644
--- a/crypto/bio/b_sock.c
+++ b/crypto/bio/b_sock.c
@@ -553,7 +553,8 @@ int BIO_socket_ioctl(int fd, long type, void *arg)
i=ioctlsocket(fd,type,(char *)arg);
#else
# if defined(OPENSSL_SYS_VMS)
- /* 2011-02-18 SMS.
+ /*-
+ * 2011-02-18 SMS.
* VMS ioctl() can't tolerate a 64-bit "void *arg", but we
* observe that all the consumers pass in an "unsigned long *",
* so we arrange a local copy with a short pointer, and use
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
*/