bio: remove TODOs

Reviewed-by: Tim Hudson <tjh@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/15539)

diff --git a/crypto/bio/b_sock.c b/crypto/bio/b_sock.c
index 5804465dfe47aa096c8422a1562dd0259d787351..b827c5b902b19a4ab46cd337617b43d32f9e9993 100644 (file)
--- a/crypto/bio/b_sock.c
+++ b/crypto/bio/b_sock.c
@@ -383,7 +383,6 @@ int BIO_sock_info(int sock,
     return 1;
 }
 
-/* TODO simplify by BIO_socket_wait() further other uses of select() in apps/ */
 /*
  * Wait on fd at most until max_time; succeed immediately if max_time == 0.
  * If for_read == 0 then assume to wait for writing, else wait for reading.

diff --git a/crypto/bio/bf_buff.c b/crypto/bio/bf_buff.c
index d12cbf9d37b4e60b66838d20c9b563a675680a02..cfed63bd72ec84154237ac529188072ec62fecaf 100644 (file)
--- a/crypto/bio/bf_buff.c
+++ b/crypto/bio/bf_buff.c
@@ -25,10 +25,8 @@ static long buffer_callback_ctrl(BIO *h, int cmd, BIO_info_cb *fp);
 static const BIO_METHOD methods_buffer = {
     BIO_TYPE_BUFFER,
     "buffer",
-    /* TODO: Convert to new style write function */
     bwrite_conv,
     buffer_write,
-    /* TODO: Convert to new style read function */
     bread_conv,
     buffer_read,
     buffer_puts,

diff --git a/crypto/bio/bf_lbuf.c b/crypto/bio/bf_lbuf.c
index 946ff0d23b22ec1c1441dc832fb619a3c086e866..73f121698768750c86f5af3457fbcc81f6104a33 100644 (file)
--- a/crypto/bio/bf_lbuf.c
+++ b/crypto/bio/bf_lbuf.c
@@ -30,10 +30,8 @@ static long linebuffer_callback_ctrl(BIO *h, int cmd, BIO_info_cb *fp);
 static const BIO_METHOD methods_linebuffer = {
     BIO_TYPE_LINEBUFFER,
     "linebuffer",
-    /* TODO: Convert to new style write function */
     bwrite_conv,
     linebuffer_write,
-    /* TODO: Convert to new style read function */
     bread_conv,
     linebuffer_read,
     linebuffer_puts,

diff --git a/crypto/bio/bf_nbio.c b/crypto/bio/bf_nbio.c
index f5b83a89f96538e5305d107c9cdf2bd98ec74f40..f9e9fe718e2dcc94f7be6bd451a4e15e99aedc5d 100644 (file)
--- a/crypto/bio/bf_nbio.c
+++ b/crypto/bio/bf_nbio.c
@@ -34,10 +34,8 @@ typedef struct nbio_test_st {
 static const BIO_METHOD methods_nbiof = {
     BIO_TYPE_NBIO_TEST,
     "non-blocking IO test filter",
-    /* TODO: Convert to new style write function */
     bwrite_conv,
     nbiof_write,
-    /* TODO: Convert to new style read function */
     bread_conv,
     nbiof_read,
     nbiof_puts,

diff --git a/crypto/bio/bf_null.c b/crypto/bio/bf_null.c
index fff9938ca1842bbbbf0d17c4cefbe7a1b2a7b938..aca4c5eb6d0b64d6e78179e9f95bb96c7e2a4f5f 100644 (file)
--- a/crypto/bio/bf_null.c
+++ b/crypto/bio/bf_null.c
@@ -25,10 +25,8 @@ static long nullf_callback_ctrl(BIO *h, int cmd, BIO_info_cb *fp);
 static const BIO_METHOD methods_nullf = {
     BIO_TYPE_NULL_FILTER,
     "NULL filter",
-    /* TODO: Convert to new style write function */
     bwrite_conv,
     nullf_write,
-    /* TODO: Convert to new style read function */
     bread_conv,
     nullf_read,
     nullf_puts,

diff --git a/crypto/bio/bss_acpt.c b/crypto/bio/bss_acpt.c
index 834c2ffef1a6df780e67b1f876b91edc1c84ffa6..c25f71cec245dfb74bc022432b792090a9452571 100644 (file)
--- a/crypto/bio/bss_acpt.c
+++ b/crypto/bio/bss_acpt.c
@@ -56,10 +56,8 @@ static void BIO_ACCEPT_free(BIO_ACCEPT *a);
 static const BIO_METHOD methods_acceptp = {
     BIO_TYPE_ACCEPT,
     "socket accept",
-    /* TODO: Convert to new style write function */
     bwrite_conv,
     acpt_write,
-    /* TODO: Convert to new style read function */
     bread_conv,
     acpt_read,
     acpt_puts,

diff --git a/crypto/bio/bss_bio.c b/crypto/bio/bss_bio.c
index 0b972b2b3ff5fcacb565c9cddc04989785210a87..699e6bf1062dc7d14d9c74298f670762088f2a46 100644 (file)
--- a/crypto/bio/bss_bio.c
+++ b/crypto/bio/bss_bio.c
@@ -38,10 +38,8 @@ static void bio_destroy_pair(BIO *bio);
 static const BIO_METHOD methods_biop = {
     BIO_TYPE_BIO,
     "BIO pair",
-    /* TODO: Convert to new style write function */
     bwrite_conv,
     bio_write,
-    /* TODO: Convert to new style read function */
     bread_conv,
     bio_read,
     bio_puts,

diff --git a/crypto/bio/bss_conn.c b/crypto/bio/bss_conn.c
index 3ab2c0d4ba30c17a06a2e9d4fe4407948e422c5b..d146c97b82a5c17aee9f64957e00392db87c6210 100644 (file)
--- a/crypto/bio/bss_conn.c
+++ b/crypto/bio/bss_conn.c
@@ -63,10 +63,8 @@ void BIO_CONNECT_free(BIO_CONNECT *a);
 static const BIO_METHOD methods_connectp = {
     BIO_TYPE_CONNECT,
     "socket connect",
-    /* TODO: Convert to new style write function */
     bwrite_conv,
     conn_write,
-    /* TODO: Convert to new style read function */
     bread_conv,
     conn_read,
     conn_puts,

diff --git a/crypto/bio/bss_dgram.c b/crypto/bio/bss_dgram.c
index af3d941abbce3ae200a2c3368bcaeda0963410aa..a530832dd8a58a7eb40b84aa8eab9db58a9e9df4 100644 (file)
--- a/crypto/bio/bss_dgram.c
+++ b/crypto/bio/bss_dgram.c
@@ -68,10 +68,8 @@ static void get_current_time(struct timeval *t);
 static const BIO_METHOD methods_dgramp = {
     BIO_TYPE_DGRAM,
     "datagram socket",
-    /* TODO: Convert to new style write function */
     bwrite_conv,
     dgram_write,
-    /* TODO: Convert to new style read function */
     bread_conv,
     dgram_read,
     dgram_puts,
@@ -86,10 +84,8 @@ static const BIO_METHOD methods_dgramp = {
 static const BIO_METHOD methods_dgramp_sctp = {
     BIO_TYPE_DGRAM_SCTP,
     "datagram sctp socket",
-    /* TODO: Convert to new style write function */
     bwrite_conv,
     dgram_sctp_write,
-    /* TODO: Convert to new style write function */
     bread_conv,
     dgram_sctp_read,
     dgram_sctp_puts,

diff --git a/crypto/bio/bss_fd.c b/crypto/bio/bss_fd.c
index 65e0b10311f06ebaa322615559fafcdb7f78fd63..f756225edb21c62c8c582e0cb183bb7f09547c26 100644 (file)
--- a/crypto/bio/bss_fd.c
+++ b/crypto/bio/bss_fd.c
@@ -60,10 +60,8 @@ int BIO_fd_should_retry(int s);
 static const BIO_METHOD methods_fdp = {
     BIO_TYPE_FD,
     "file descriptor",
-    /* TODO: Convert to new style write function */
     bwrite_conv,
     fd_write,
-    /* TODO: Convert to new style read function */
     bread_conv,
     fd_read,
     fd_puts,

diff --git a/crypto/bio/bss_file.c b/crypto/bio/bss_file.c
index affd67ac02ec4f92aaa5e7028c852e56bb4cc790..a6143b6abcf6648b326299ae09274764e9901617 100644 (file)
--- a/crypto/bio/bss_file.c
+++ b/crypto/bio/bss_file.c
@@ -42,10 +42,8 @@ static int file_free(BIO *data);
 static const BIO_METHOD methods_filep = {
     BIO_TYPE_FILE,
     "FILE pointer",
-    /* TODO: Convert to new style write function */
     bwrite_conv,
     file_write,
-    /* TODO: Convert to new style read function */
     bread_conv,
     file_read,
     file_puts,
@@ -407,10 +405,8 @@ static int file_free(BIO *a)
 static const BIO_METHOD methods_filep = {
     BIO_TYPE_FILE,
     "FILE pointer",
-    /* TODO: Convert to new style write function */
     bwrite_conv,
     file_write,
-    /* TODO: Convert to new style read function */
     bread_conv,
     file_read,
     file_puts,

diff --git a/crypto/bio/bss_log.c b/crypto/bio/bss_log.c
index b42cc4af8f125ce68600a5c97981a428da8fc83a..82abfd5cec6305c661cdb14fd50d602ba7802925 100644 (file)
--- a/crypto/bio/bss_log.c
+++ b/crypto/bio/bss_log.c
@@ -87,7 +87,6 @@ static void xcloselog(BIO *bp);
 static const BIO_METHOD methods_slg = {
     BIO_TYPE_MEM,
     "syslog",
-    /* TODO: Convert to new style write function */
     bwrite_conv,
     slg_write,
     NULL,                      /* slg_write_old,    */

diff --git a/crypto/bio/bss_mem.c b/crypto/bio/bss_mem.c
index 5e48669e1ef813e1069f65870d654724e830ad16..7e501762bb0b3e43238960b274bb02b5032af254 100644 (file)
--- a/crypto/bio/bss_mem.c
+++ b/crypto/bio/bss_mem.c
@@ -26,10 +26,8 @@ static int mem_buf_sync(BIO *h);
 static const BIO_METHOD mem_method = {
     BIO_TYPE_MEM,
     "memory buffer",
-    /* TODO: Convert to new style write function */
     bwrite_conv,
     mem_write,
-    /* TODO: Convert to new style read function */
     bread_conv,
     mem_read,
     mem_puts,
@@ -43,10 +41,8 @@ static const BIO_METHOD mem_method = {
 static const BIO_METHOD secmem_method = {
     BIO_TYPE_MEM,
     "secure memory buffer",
-    /* TODO: Convert to new style write function */
     bwrite_conv,
     mem_write,
-    /* TODO: Convert to new style read function */
     bread_conv,
     mem_read,
     mem_puts,

diff --git a/crypto/bio/bss_null.c b/crypto/bio/bss_null.c
index f677bbbb151fd933aadf84c268e9a76638e447d7..371d5b7cd8d809dfe86a9d0da15d8a82880b1230 100644 (file)
--- a/crypto/bio/bss_null.c
+++ b/crypto/bio/bss_null.c
@@ -20,10 +20,8 @@ static long null_ctrl(BIO *h, int cmd, long arg1, void *arg2);
 static const BIO_METHOD null_method = {
     BIO_TYPE_NULL,
     "NULL",
-    /* TODO: Convert to new style write function */
     bwrite_conv,
     null_write,
-    /* TODO: Convert to new style read function */
     bread_conv,
     null_read,
     null_puts,

diff --git a/crypto/bio/bss_sock.c b/crypto/bio/bss_sock.c
index e142de1674fe314d9cc5565aaf90675109f06a77..f5d88102303a27603930cc182ebe487869b7df53 100644 (file)
--- a/crypto/bio/bss_sock.c
+++ b/crypto/bio/bss_sock.c
@@ -38,10 +38,8 @@ int BIO_sock_should_retry(int s);
 static const BIO_METHOD methods_sockp = {
     BIO_TYPE_SOCKET,
     "socket",
-    /* TODO: Convert to new style write function */
     bwrite_conv,
     sock_write,
-    /* TODO: Convert to new style read function */
     bread_conv,
     sock_read,
     sock_puts,