[openssl-commits] [openssl] master update
paul.dale at oracle.com
paul.dale at oracle.com
Sun Dec 17 21:05:14 UTC 2017
The branch master has been updated
via b4ff66223b53ad9d2f5b4efd75bf8d52cc59c8dd (commit)
from fce78bd4ede74d4fa7bd1c8195d8f7bc9403bd4c (commit)
- Log -----------------------------------------------------------------
commit b4ff66223b53ad9d2f5b4efd75bf8d52cc59c8dd
Author: Daniel Bevenius <daniel.bevenius at gmail.com>
Date: Mon Dec 18 07:04:48 2017 +1000
Add comments to NULL func ptrs in bio_method_st
This commit adds comments to bio_method_st definitions where the
function pointers are defined as NULL. Most of the structs have comments
but some where missing and not all consitent.
CLA: trivial
Reviewed-by: Paul Dale <paul.dale at oracle.com>
Reviewed-by: Richard Levitte <levitte at openssl.org>
(Merged from https://github.com/openssl/openssl/pull/4881)
-----------------------------------------------------------------------
Summary of changes:
crypto/bio/bss_acpt.c | 4 ++--
crypto/bio/bss_conn.c | 2 +-
crypto/bio/bss_dgram.c | 8 ++++----
crypto/bio/bss_fd.c | 2 +-
crypto/bio/bss_file.c | 4 ++--
crypto/bio/bss_log.c | 6 +++---
crypto/bio/bss_mem.c | 4 ++--
crypto/bio/bss_null.c | 2 +-
crypto/bio/bss_sock.c | 4 ++--
crypto/comp/c_zlib.c | 4 ++--
ssl/bio_ssl.c | 6 +++---
11 files changed, 23 insertions(+), 23 deletions(-)
diff --git a/crypto/bio/bss_acpt.c b/crypto/bio/bss_acpt.c
index e49c7ce..e426ecd 100644
--- a/crypto/bio/bss_acpt.c
+++ b/crypto/bio/bss_acpt.c
@@ -61,11 +61,11 @@ static const BIO_METHOD methods_acceptp = {
bread_conv,
acpt_read,
acpt_puts,
- NULL, /* connect_gets, */
+ NULL, /* connect_gets, */
acpt_ctrl,
acpt_new,
acpt_free,
- NULL,
+ NULL, /* connect_callback_ctrl */
};
const BIO_METHOD *BIO_s_accept(void)
diff --git a/crypto/bio/bss_conn.c b/crypto/bio/bss_conn.c
index 78e42d0..5c461ae 100644
--- a/crypto/bio/bss_conn.c
+++ b/crypto/bio/bss_conn.c
@@ -65,7 +65,7 @@ static const BIO_METHOD methods_connectp = {
bread_conv,
conn_read,
conn_puts,
- NULL, /* connect_gets, */
+ NULL, /* conn_gets, */
conn_ctrl,
conn_new,
conn_free,
diff --git a/crypto/bio/bss_dgram.c b/crypto/bio/bss_dgram.c
index aad8c85..90fe3c8 100644
--- a/crypto/bio/bss_dgram.c
+++ b/crypto/bio/bss_dgram.c
@@ -73,11 +73,11 @@ static const BIO_METHOD methods_dgramp = {
bread_conv,
dgram_read,
dgram_puts,
- NULL, /* dgram_gets, */
+ NULL, /* dgram_gets, */
dgram_ctrl,
dgram_new,
dgram_free,
- NULL,
+ NULL, /* dgram_callback_ctrl */
};
# ifndef OPENSSL_NO_SCTP
@@ -91,11 +91,11 @@ static const BIO_METHOD methods_dgramp_sctp = {
bread_conv,
dgram_sctp_read,
dgram_sctp_puts,
- NULL, /* dgram_gets, */
+ NULL, /* dgram_gets, */
dgram_sctp_ctrl,
dgram_sctp_new,
dgram_sctp_free,
- NULL,
+ NULL, /* dgram_callback_ctrl */
};
# endif
diff --git a/crypto/bio/bss_fd.c b/crypto/bio/bss_fd.c
index 269a08b..5bc539c 100644
--- a/crypto/bio/bss_fd.c
+++ b/crypto/bio/bss_fd.c
@@ -71,7 +71,7 @@ static const BIO_METHOD methods_fdp = {
fd_ctrl,
fd_new,
fd_free,
- NULL,
+ NULL, /* fd_callback_ctrl */
};
const BIO_METHOD *BIO_s_fd(void)
diff --git a/crypto/bio/bss_file.c b/crypto/bio/bss_file.c
index 25d7cc0..8de2391 100644
--- a/crypto/bio/bss_file.c
+++ b/crypto/bio/bss_file.c
@@ -56,7 +56,7 @@ static const BIO_METHOD methods_filep = {
file_ctrl,
file_new,
file_free,
- NULL,
+ NULL, /* file_callback_ctrl */
};
BIO *BIO_new_file(const char *filename, const char *mode)
@@ -408,7 +408,7 @@ static const BIO_METHOD methods_filep = {
file_ctrl,
file_new,
file_free,
- NULL,
+ NULL, /* file_callback_ctrl */
};
const BIO_METHOD *BIO_s_file(void)
diff --git a/crypto/bio/bss_log.c b/crypto/bio/bss_log.c
index 040fbcd..c26b10e 100644
--- a/crypto/bio/bss_log.c
+++ b/crypto/bio/bss_log.c
@@ -90,14 +90,14 @@ static const BIO_METHOD methods_slg = {
/* TODO: Convert to new style write function */
bwrite_conv,
slg_write,
- NULL,
- NULL,
+ NULL, /* slg_write_old, */
+ NULL, /* slg_read, */
slg_puts,
NULL,
slg_ctrl,
slg_new,
slg_free,
- NULL,
+ NULL, /* slg_callback_ctrl */
};
const BIO_METHOD *BIO_s_log(void)
diff --git a/crypto/bio/bss_mem.c b/crypto/bio/bss_mem.c
index a50d416..7678a1d 100644
--- a/crypto/bio/bss_mem.c
+++ b/crypto/bio/bss_mem.c
@@ -37,7 +37,7 @@ static const BIO_METHOD mem_method = {
mem_ctrl,
mem_new,
mem_free,
- NULL,
+ NULL, /* mem_callback_ctrl */
};
static const BIO_METHOD secmem_method = {
@@ -54,7 +54,7 @@ static const BIO_METHOD secmem_method = {
mem_ctrl,
secmem_new,
mem_free,
- NULL,
+ NULL, /* mem_callback_ctrl */
};
/* BIO memory stores buffer and read pointer */
diff --git a/crypto/bio/bss_null.c b/crypto/bio/bss_null.c
index 13982c0..df3a921 100644
--- a/crypto/bio/bss_null.c
+++ b/crypto/bio/bss_null.c
@@ -33,7 +33,7 @@ static const BIO_METHOD null_method = {
null_ctrl,
null_new,
null_free,
- NULL,
+ NULL, /* null_callback_ctrl */
};
const BIO_METHOD *BIO_s_null(void)
diff --git a/crypto/bio/bss_sock.c b/crypto/bio/bss_sock.c
index 09f127b..ad38453 100644
--- a/crypto/bio/bss_sock.c
+++ b/crypto/bio/bss_sock.c
@@ -44,11 +44,11 @@ static const BIO_METHOD methods_sockp = {
bread_conv,
sock_read,
sock_puts,
- NULL, /* sock_gets, */
+ NULL, /* sock_gets, */
sock_ctrl,
sock_new,
sock_free,
- NULL,
+ NULL, /* sock_callback_ctrl */
};
const BIO_METHOD *BIO_s_socket(void)
diff --git a/crypto/comp/c_zlib.c b/crypto/comp/c_zlib.c
index 5d82e15..d688dee 100644
--- a/crypto/comp/c_zlib.c
+++ b/crypto/comp/c_zlib.c
@@ -302,8 +302,8 @@ static const BIO_METHOD bio_meth_zlib = {
/* TODO: Convert to new style read function */
bread_conv,
bio_zlib_read,
- NULL,
- NULL,
+ NULL, /* bio_zlib_puts, */
+ NULL, /* bio_zlib_gets, */
bio_zlib_ctrl,
bio_zlib_new,
bio_zlib_free,
diff --git a/ssl/bio_ssl.c b/ssl/bio_ssl.c
index ccc0c76..d1876d8 100644
--- a/ssl/bio_ssl.c
+++ b/ssl/bio_ssl.c
@@ -37,11 +37,11 @@ static const BIO_METHOD methods_sslp = {
BIO_TYPE_SSL,
"ssl",
ssl_write,
- NULL,
+ NULL, /* ssl_write_old, */
ssl_read,
- NULL,
+ NULL, /* ssl_read_old, */
ssl_puts,
- NULL, /* ssl_gets, */
+ NULL, /* ssl_gets, */
ssl_ctrl,
ssl_new,
ssl_free,
More information about the openssl-commits
mailing list