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)
This commit is contained in:
Daniel Bevenius 2017-12-08 08:20:10 +01:00 committed by Andy Polyakov
parent 6aff543b9b
commit 27ab91951c
7 changed files with 14 additions and 7 deletions

View File

@ -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,

View File

@ -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,

View File

@ -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,

View File

@ -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,

View File

@ -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,

View File

@ -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,

View File

@ -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,