Make BIO_METHOD struct definitions consistent

I noticed that some of the BIO_METHOD structs are placing the name on
the same line as the type and some don't. This commit places the name
on a separate line for consistency (which looks like what the majority
do)

CLA: trivial

Reviewed-by: Andy Polyakov <appro@openssl.org>
Reviewed-by: Paul Dale <paul.dale@oracle.com>
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/4878)

diff --git a/crypto/bio/bss_fd.c b/crypto/bio/bss_fd.c
index 9c1826c06c1c82486efa21da9e93bae897b1ccd4..269a08baa942faa847cf66608aa0df01ff9d4360 100644 (file)
--- a/crypto/bio/bss_fd.c
+++ b/crypto/bio/bss_fd.c
@@ -58,7 +58,8 @@ static int fd_free(BIO *data);
 int BIO_fd_should_retry(int s);
 
 static const BIO_METHOD methods_fdp = {
-    BIO_TYPE_FD, "file descriptor",
+    BIO_TYPE_FD,
+    "file descriptor",
     /* TODO: Convert to new style write function */
     bwrite_conv,
     fd_write,

diff --git a/crypto/bio/bss_log.c b/crypto/bio/bss_log.c
index b5b9363c383d424b4c144a68da69319247855075..040fbcd2bbdada77992c5ec86ff46dc99acc3542 100644 (file)
--- a/crypto/bio/bss_log.c
+++ b/crypto/bio/bss_log.c
@@ -85,7 +85,8 @@ static void xsyslog(BIO *bp, int priority, const char *string);
 static void xcloselog(BIO *bp);
 
 static const BIO_METHOD methods_slg = {
-    BIO_TYPE_MEM, "syslog",
+    BIO_TYPE_MEM,
+    "syslog",
     /* TODO: Convert to new style write function */
     bwrite_conv,
     slg_write,

diff --git a/crypto/evp/bio_b64.c b/crypto/evp/bio_b64.c
index 85fbeab187ab0df7a09d95e949d536c7902f2e41..87a0cce0f687f1d61d90316060dc16cb03aced57 100644 (file)
--- a/crypto/evp/bio_b64.c
+++ b/crypto/evp/bio_b64.c
@@ -44,7 +44,8 @@ typedef struct b64_struct {
 } BIO_B64_CTX;
 
 static const BIO_METHOD methods_b64 = {
-    BIO_TYPE_BASE64, "base64 encoding",
+    BIO_TYPE_BASE64,
+    "base64 encoding",
     /* TODO: Convert to new style write function */
     bwrite_conv,
     b64_write,

diff --git a/crypto/evp/bio_enc.c b/crypto/evp/bio_enc.c
index 4e1f8bfafa24900ef8be6335dd9c309ecd65eb7b..366e2e928b51e62058432bfe0bc2e347112ff633 100644 (file)
--- a/crypto/evp/bio_enc.c
+++ b/crypto/evp/bio_enc.c
@@ -40,7 +40,8 @@ typedef struct enc_struct {
 } BIO_ENC_CTX;
 
 static const BIO_METHOD methods_enc = {
-    BIO_TYPE_CIPHER, "cipher",
+    BIO_TYPE_CIPHER,
+    "cipher",
     /* TODO: Convert to new style write function */
     bwrite_conv,
     enc_write,

diff --git a/crypto/evp/bio_md.c b/crypto/evp/bio_md.c
index a59c2d38022c4cf4ad04c1b7b667054541e2e231..50069f0b610a9f45808eb6638bf8393e7cc2d7d9 100644 (file)
--- a/crypto/evp/bio_md.c
+++ b/crypto/evp/bio_md.c
@@ -29,7 +29,8 @@ static int md_free(BIO *data);
 static long md_callback_ctrl(BIO *h, int cmd, bio_info_cb *fp);
 
 static const BIO_METHOD methods_md = {
-    BIO_TYPE_MD, "message digest",
+    BIO_TYPE_MD,
+    "message digest",
     /* TODO: Convert to new style write function */
     bwrite_conv,
     md_write,

diff --git a/crypto/evp/bio_ok.c b/crypto/evp/bio_ok.c
index 738ced464ace52209c15537a51a0ccf580cd2ce6..0f744fc72e08bfba42ad9cdd09fcf8432913aeab 100644 (file)
--- a/crypto/evp/bio_ok.c
+++ b/crypto/evp/bio_ok.c
@@ -108,7 +108,8 @@ typedef struct ok_struct {
 } BIO_OK_CTX;
 
 static const BIO_METHOD methods_ok = {
-    BIO_TYPE_CIPHER, "reliable",
+    BIO_TYPE_CIPHER,
+    "reliable",
     /* TODO: Convert to new style write function */
     bwrite_conv,
     ok_write,

diff --git a/ssl/bio_ssl.c b/ssl/bio_ssl.c
index 722d9420e3bc739b8aff36d0b1658a247381feac..5516260409fecc79666680a33856127f79df38b7 100644 (file)
--- a/ssl/bio_ssl.c
+++ b/ssl/bio_ssl.c
@@ -34,7 +34,8 @@ typedef struct bio_ssl_st {
 } BIO_SSL;
 
 static const BIO_METHOD methods_sslp = {
-    BIO_TYPE_SSL, "ssl",
+    BIO_TYPE_SSL,
+    "ssl",
     ssl_write,
     NULL,
     ssl_read,