diff options
author | Daniel Bevenius <daniel.bevenius@gmail.com> | 2017-12-08 08:20:10 +0100 |
---|---|---|
committer | Richard Levitte <levitte@openssl.org> | 2017-12-10 10:40:05 +0100 |
commit | b6f28b1243fdcddc872cb170ea87ab2138b5c388 (patch) | |
tree | 07fccab8ab9420c8114040759cadb2a486ebfe8b /crypto | |
parent | a836f9fa951e33a5186e2421413de0b50ed2233a (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)
(cherry picked from commit 27ab91951c96364351f1ea0652dbf14622440345)
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 e8d3e152de..91e720449a 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", fd_write, fd_read, fd_puts, diff --git a/crypto/bio/bss_log.c b/crypto/bio/bss_log.c index 6cbde4d2fe..97241e5302 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", slg_write, NULL, slg_puts, diff --git a/crypto/evp/bio_b64.c b/crypto/evp/bio_b64.c index 32a884a711..228b6e6c01 100644 --- a/crypto/evp/bio_b64.c +++ b/crypto/evp/bio_b64.c @@ -47,7 +47,8 @@ typedef struct b64_struct { } BIO_B64_CTX; static const BIO_METHOD methods_b64 = { - BIO_TYPE_BASE64, "base64 encoding", + BIO_TYPE_BASE64, + "base64 encoding", b64_write, b64_read, b64_puts, diff --git a/crypto/evp/bio_enc.c b/crypto/evp/bio_enc.c index 5a3beef97f..742080a80e 100644 --- a/crypto/evp/bio_enc.c +++ b/crypto/evp/bio_enc.c @@ -46,7 +46,8 @@ typedef struct enc_struct { } BIO_ENC_CTX; static const BIO_METHOD methods_enc = { - BIO_TYPE_CIPHER, "cipher", + BIO_TYPE_CIPHER, + "cipher", enc_write, enc_read, NULL, /* enc_puts, */ diff --git a/crypto/evp/bio_md.c b/crypto/evp/bio_md.c index cd968ec2d4..fff8027132 100644 --- a/crypto/evp/bio_md.c +++ b/crypto/evp/bio_md.c @@ -32,7 +32,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", md_write, md_read, NULL, /* md_puts, */ diff --git a/crypto/evp/bio_ok.c b/crypto/evp/bio_ok.c index 7974b96311..023b3e3bdd 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", ok_write, ok_read, NULL, /* ok_puts, */ |