From 3ebf48c494177b3b775febf8302322375c80fe3b Mon Sep 17 00:00:00 2001
From: jsing <>
Date: Mon, 26 May 2014 12:48:11 +0000
Subject: Use C99 initialisers for BIO_METHOD.
---
src/lib/libssl/bio_ssl.c | 18 +++++++++---------
src/lib/libssl/src/ssl/bio_ssl.c | 18 +++++++++---------
2 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/src/lib/libssl/bio_ssl.c b/src/lib/libssl/bio_ssl.c
index 96ba1ad09c..5b14ea3824 100644
--- a/src/lib/libssl/bio_ssl.c
+++ b/src/lib/libssl/bio_ssl.c
@@ -83,15 +83,15 @@ typedef struct bio_ssl_st {
} BIO_SSL;
static BIO_METHOD methods_sslp = {
- BIO_TYPE_SSL, "ssl",
- ssl_write,
- ssl_read,
- ssl_puts,
- NULL, /* ssl_gets, */
- ssl_ctrl,
- ssl_new,
- ssl_free,
- ssl_callback_ctrl,
+ .type = BIO_TYPE_SSL,
+ .name = "ssl",
+ .bwrite = ssl_write,
+ .bread = ssl_read,
+ .bputs = ssl_puts,
+ .ctrl = ssl_ctrl,
+ .create = ssl_new,
+ .destroy = ssl_free,
+ .callback_ctrl = ssl_callback_ctrl,
};
BIO_METHOD *
diff --git a/src/lib/libssl/src/ssl/bio_ssl.c b/src/lib/libssl/src/ssl/bio_ssl.c
index 96ba1ad09c..5b14ea3824 100644
--- a/src/lib/libssl/src/ssl/bio_ssl.c
+++ b/src/lib/libssl/src/ssl/bio_ssl.c
@@ -83,15 +83,15 @@ typedef struct bio_ssl_st {
} BIO_SSL;
static BIO_METHOD methods_sslp = {
- BIO_TYPE_SSL, "ssl",
- ssl_write,
- ssl_read,
- ssl_puts,
- NULL, /* ssl_gets, */
- ssl_ctrl,
- ssl_new,
- ssl_free,
- ssl_callback_ctrl,
+ .type = BIO_TYPE_SSL,
+ .name = "ssl",
+ .bwrite = ssl_write,
+ .bread = ssl_read,
+ .bputs = ssl_puts,
+ .ctrl = ssl_ctrl,
+ .create = ssl_new,
+ .destroy = ssl_free,
+ .callback_ctrl = ssl_callback_ctrl,
};
BIO_METHOD *
--
cgit v1.2.3-55-g6feb