diff options
| author | Daniel Bevenius <daniel.bevenius@gmail.com> | 2017-12-08 08:20:10 +0100 |
|---|---|---|
| committer | Andy Polyakov <appro@openssl.org> | 2017-12-09 21:27:29 +0100 |
| commit | 27ab91951c96364351f1ea0652dbf14622440345 (patch) | |
| tree | 53501e2f5f183b94d9ad2ea80e9f3e87f8875806 /crypto | |
| parent | 6aff543b9bf14bdac7f5385a9e56b8785b30f6d8 (diff) | |
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)
Diffstat (limited to 'crypto')
| -rw-r--r-- | crypto/bio/bss_fd.c | 3 | ||||
| -rw-r--r-- | crypto/bio/bss_log.c | 3 | ||||
| -rw-r--r-- | crypto/evp/bio_b64.c | 3 | ||||
| -rw-r--r-- | crypto/evp/bio_enc.c | 3 | ||||
| -rw-r--r-- | crypto/evp/bio_md.c | 3 | ||||
| -rw-r--r-- | crypto/evp/bio_ok.c | 3 |
6 files changed, 12 insertions, 6 deletions
diff --git a/crypto/bio/bss_fd.c b/crypto/bio/bss_fd.c index 9c1826c06c..269a08baa9 100644 --- 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 b5b9363c38..040fbcd2bb 100644 --- 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 85fbeab187..87a0cce0f6 100644 --- 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 4e1f8bfafa..366e2e928b 100644 --- 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 a59c2d3802..50069f0b61 100644 --- 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 738ced464a..0f744fc72e 100644 --- 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, |