Commit b6f28b12 authored by Daniel Bevenius's avatar Daniel Bevenius Committed by Richard Levitte
Browse files

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: default avatarAndy Polyakov <appro@openssl.org>
Reviewed-by: default avatarPaul Dale <paul.dale@oracle.com>
Reviewed-by: default avatarRichard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/4878)

(cherry picked from commit 27ab9195)
parent a836f9fa

crypto/bio/bss_fd.c

+2 −1
Original line number Diff line number Diff line
@@ -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,

crypto/bio/bss_log.c

+2 −1
Original line number Diff line number Diff line
@@ -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,

crypto/evp/bio_b64.c

+2 −1
Original line number Diff line number Diff line
@@ -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,

crypto/evp/bio_enc.c

+2 −1
Original line number Diff line number Diff line
@@ -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, */

crypto/evp/bio_md.c

+2 −1
Original line number Diff line number Diff line
@@ -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, */