From 27f04b6fefa84dda7e41d6cbfd72696e7ea088b0 Mon Sep 17 00:00:00 2001
From: deraadt <>
Date: Thu, 17 Apr 2014 17:50:45 +0000
Subject: some KNF cleanup following the script

---
 src/lib/libcrypto/bio/bf_buff.c   |  4 ++--
 src/lib/libcrypto/bio/bf_lbuf.c   |  4 ++--
 src/lib/libcrypto/bio/bf_nbio.c   |  4 ++--
 src/lib/libcrypto/bio/bf_null.c   |  4 ++--
 src/lib/libcrypto/bio/bio_lib.c   | 36 ++++++++++++++++++------------------
 src/lib/libcrypto/bio/bss_acpt.c  | 12 ++++++------
 src/lib/libcrypto/bio/bss_bio.c   |  4 ++--
 src/lib/libcrypto/bio/bss_conn.c  | 12 ++++++------
 src/lib/libcrypto/bio/bss_dgram.c | 16 ++++++++--------
 src/lib/libcrypto/bio/bss_fd.c    |  8 ++++----
 src/lib/libcrypto/bio/bss_file.c  | 12 ++++++------
 src/lib/libcrypto/bio/bss_log.c   |  4 ++--
 src/lib/libcrypto/bio/bss_mem.c   |  8 ++++----
 src/lib/libcrypto/bio/bss_null.c  |  4 ++--
 src/lib/libcrypto/bio/bss_sock.c  |  8 ++++----
 15 files changed, 70 insertions(+), 70 deletions(-)

(limited to 'src/lib/libcrypto/bio')

diff --git a/src/lib/libcrypto/bio/bf_buff.c b/src/lib/libcrypto/bio/bf_buff.c
index be2ebab148..7b76e895a4 100644
--- a/src/lib/libcrypto/bio/bf_buff.c
+++ b/src/lib/libcrypto/bio/bf_buff.c
@@ -84,8 +84,8 @@ static BIO_METHOD methods_buffer = {
 	buffer_callback_ctrl,
 };
 
-BIO_METHOD
-*BIO_f_buffer(void)
+BIO_METHOD *
+BIO_f_buffer(void)
 {
 	return (&methods_buffer);
 }
diff --git a/src/lib/libcrypto/bio/bf_lbuf.c b/src/lib/libcrypto/bio/bf_lbuf.c
index 5020795ded..e233cbc92c 100644
--- a/src/lib/libcrypto/bio/bf_lbuf.c
+++ b/src/lib/libcrypto/bio/bf_lbuf.c
@@ -89,8 +89,8 @@ static BIO_METHOD methods_linebuffer = {
 	linebuffer_callback_ctrl,
 };
 
-BIO_METHOD
-*BIO_f_linebuffer(void)
+BIO_METHOD *
+BIO_f_linebuffer(void)
 {
 	return (&methods_linebuffer);
 }
diff --git a/src/lib/libcrypto/bio/bf_nbio.c b/src/lib/libcrypto/bio/bf_nbio.c
index 200ca706ff..48c9781700 100644
--- a/src/lib/libcrypto/bio/bf_nbio.c
+++ b/src/lib/libcrypto/bio/bf_nbio.c
@@ -93,8 +93,8 @@ static BIO_METHOD methods_nbiof = {
 	nbiof_callback_ctrl,
 };
 
-BIO_METHOD
-*BIO_f_nbio_test(void)
+BIO_METHOD *
+BIO_f_nbio_test(void)
 {
 	return (&methods_nbiof);
 }
diff --git a/src/lib/libcrypto/bio/bf_null.c b/src/lib/libcrypto/bio/bf_null.c
index ada677c91e..3bba2afe98 100644
--- a/src/lib/libcrypto/bio/bf_null.c
+++ b/src/lib/libcrypto/bio/bf_null.c
@@ -86,8 +86,8 @@ static BIO_METHOD methods_nullf = {
 	nullf_callback_ctrl,
 };
 
-BIO_METHOD
-*BIO_f_null(void)
+BIO_METHOD *
+BIO_f_null(void)
 {
 	return (&methods_nullf);
 }
diff --git a/src/lib/libcrypto/bio/bio_lib.c b/src/lib/libcrypto/bio/bio_lib.c
index c226d943af..485374931b 100644
--- a/src/lib/libcrypto/bio/bio_lib.c
+++ b/src/lib/libcrypto/bio/bio_lib.c
@@ -63,8 +63,8 @@
 #include <openssl/bio.h>
 #include <openssl/stack.h>
 
-BIO
-*BIO_new(BIO_METHOD *method)
+BIO *
+BIO_new(BIO_METHOD *method)
 {
 	BIO *ret = NULL;
 
@@ -352,8 +352,8 @@ BIO_int_ctrl(BIO *b, int cmd, long larg, int iarg)
 	return (BIO_ctrl(b, cmd, larg, (char *)&i));
 }
 
-char
-*BIO_ptr_ctrl(BIO *b, int cmd, long larg)
+char *
+BIO_ptr_ctrl(BIO *b, int cmd, long larg)
 {
 	char *p = NULL;
 
@@ -435,8 +435,8 @@ BIO_ctrl_wpending(BIO *bio)
 
 
 /* put the 'bio' on the end of b's list of operators */
-BIO
-*BIO_push(BIO *b, BIO *bio)
+BIO *
+BIO_push(BIO *b, BIO *bio)
 {
 	BIO *lb;
 
@@ -454,8 +454,8 @@ BIO
 }
 
 /* Remove the first and return the rest */
-BIO
-*BIO_pop(BIO *b)
+BIO *
+BIO_pop(BIO *b)
 {
 	BIO *ret;
 
@@ -475,8 +475,8 @@ BIO
 	return (ret);
 }
 
-BIO
-*BIO_get_retry_BIO(BIO *bio, int *reason)
+BIO *
+BIO_get_retry_BIO(BIO *bio, int *reason)
 {
 	BIO *b, *last;
 
@@ -500,8 +500,8 @@ BIO_get_retry_reason(BIO *bio)
 	return (bio->retry_reason);
 }
 
-BIO
-*BIO_find_type(BIO *bio, int type)
+BIO *
+BIO_find_type(BIO *bio, int type)
 {
 	int mt, mask;
 
@@ -522,8 +522,8 @@ BIO
 	return (NULL);
 }
 
-BIO
-*BIO_next(BIO *b)
+BIO *
+BIO_next(BIO *b)
 {
 	if (!b)
 		return NULL;
@@ -547,8 +547,8 @@ BIO_free_all(BIO *bio)
 	}
 }
 
-BIO
-*BIO_dup_chain(BIO *in)
+BIO *
+BIO_dup_chain(BIO *in)
 {
 	BIO *ret = NULL, *eoc = NULL, *bio, *new_bio;
 
@@ -611,8 +611,8 @@ BIO_set_ex_data(BIO *bio, int idx, void *data)
 	return (CRYPTO_set_ex_data(&(bio->ex_data), idx, data));
 }
 
-void
-*BIO_get_ex_data(BIO *bio, int idx)
+void *
+BIO_get_ex_data(BIO *bio, int idx)
 {
 	return (CRYPTO_get_ex_data(&(bio->ex_data), idx));
 }
diff --git a/src/lib/libcrypto/bio/bss_acpt.c b/src/lib/libcrypto/bio/bss_acpt.c
index 161b5d01f8..a272ada366 100644
--- a/src/lib/libcrypto/bio/bss_acpt.c
+++ b/src/lib/libcrypto/bio/bss_acpt.c
@@ -110,8 +110,8 @@ static BIO_METHOD methods_acceptp = {
 	NULL,
 };
 
-BIO_METHOD
-*BIO_s_accept(void)
+BIO_METHOD *
+BIO_s_accept(void)
 {
 	return (&methods_acceptp);
 }
@@ -132,8 +132,8 @@ acpt_new(BIO *bi)
 	return (1);
 }
 
-static BIO_ACCEPT
-*BIO_ACCEPT_new(void)
+static BIO_ACCEPT *
+BIO_ACCEPT_new(void)
 {
 	BIO_ACCEPT *ret;
 
@@ -443,8 +443,8 @@ acpt_puts(BIO *bp, const char *str)
 	return (ret);
 }
 
-BIO
-*BIO_new_accept(char *str)
+BIO *
+BIO_new_accept(char *str)
 {
 	BIO *ret;
 
diff --git a/src/lib/libcrypto/bio/bss_bio.c b/src/lib/libcrypto/bio/bss_bio.c
index 4d93aba0a4..33a0709aaf 100644
--- a/src/lib/libcrypto/bio/bss_bio.c
+++ b/src/lib/libcrypto/bio/bss_bio.c
@@ -116,8 +116,8 @@ static BIO_METHOD methods_biop = {
 	NULL /* no bio_callback_ctrl */
 };
 
-BIO_METHOD
-*BIO_s_bio(void)
+BIO_METHOD *
+BIO_s_bio(void)
 {
 	return &methods_biop;
 }
diff --git a/src/lib/libcrypto/bio/bss_conn.c b/src/lib/libcrypto/bio/bss_conn.c
index 78ce240648..9c5320cafb 100644
--- a/src/lib/libcrypto/bio/bss_conn.c
+++ b/src/lib/libcrypto/bio/bss_conn.c
@@ -288,8 +288,8 @@ end:
 	return (ret);
 }
 
-BIO_CONNECT
-*BIO_CONNECT_new(void)
+BIO_CONNECT *
+BIO_CONNECT_new(void)
 {
 	BIO_CONNECT *ret;
 
@@ -322,8 +322,8 @@ BIO_CONNECT_free(BIO_CONNECT *a)
 	free(a);
 }
 
-BIO_METHOD
-*BIO_s_connect(void)
+BIO_METHOD *
+BIO_s_connect(void)
 {
 	return (&methods_connectp);
 }
@@ -592,8 +592,8 @@ conn_puts(BIO *bp, const char *str)
 	return (ret);
 }
 
-BIO
-*BIO_new_connect(char *str)
+BIO *
+BIO_new_connect(char *str)
 {
 	BIO *ret;
 
diff --git a/src/lib/libcrypto/bio/bss_dgram.c b/src/lib/libcrypto/bio/bss_dgram.c
index e0445fc97e..4c54601abc 100644
--- a/src/lib/libcrypto/bio/bss_dgram.c
+++ b/src/lib/libcrypto/bio/bss_dgram.c
@@ -187,14 +187,14 @@ typedef struct bio_dgram_sctp_data_st {
 } bio_dgram_sctp_data;
 #endif
 
-BIO_METHOD
-*BIO_s_datagram(void)
+BIO_METHOD *
+BIO_s_datagram(void)
 {
 	return (&methods_dgramp);
 }
 
-BIO
-*BIO_new_dgram(int fd, int close_flag)
+BIO *
+BIO_new_dgram(int fd, int close_flag)
 {
 	BIO *ret;
 
@@ -764,14 +764,14 @@ dgram_puts(BIO *bp, const char *str)
 }
 
 #ifndef OPENSSL_NO_SCTP
-BIO_METHOD
-*BIO_s_datagram_sctp(void)
+BIO_METHOD *
+BIO_s_datagram_sctp(void)
 {
 	return (&methods_dgramp_sctp);
 }
 
-BIO
-*BIO_new_dgram_sctp(int fd, int close_flag)
+BIO *
+BIO_new_dgram_sctp(int fd, int close_flag)
 {
 	BIO *bio;
 	int ret, optval = 20000;
diff --git a/src/lib/libcrypto/bio/bss_fd.c b/src/lib/libcrypto/bio/bss_fd.c
index 988104e77c..4369d6411d 100644
--- a/src/lib/libcrypto/bio/bss_fd.c
+++ b/src/lib/libcrypto/bio/bss_fd.c
@@ -90,14 +90,14 @@ static BIO_METHOD methods_fdp = {
 	NULL,
 };
 
-BIO_METHOD
-*BIO_s_fd(void)
+BIO_METHOD *
+BIO_s_fd(void)
 {
 	return (&methods_fdp);
 }
 
-BIO
-*BIO_new_fd(int fd, int close_flag)
+BIO *
+BIO_new_fd(int fd, int close_flag)
 {
 	BIO *ret;
 	ret = BIO_new(BIO_s_fd());
diff --git a/src/lib/libcrypto/bio/bss_file.c b/src/lib/libcrypto/bio/bss_file.c
index c92c4753aa..995c623341 100644
--- a/src/lib/libcrypto/bio/bss_file.c
+++ b/src/lib/libcrypto/bio/bss_file.c
@@ -112,8 +112,8 @@ static BIO_METHOD methods_filep = {
 	NULL,
 };
 
-BIO
-*BIO_new_file(const char *filename, const char *mode)
+BIO *
+BIO_new_file(const char *filename, const char *mode)
 {
 	BIO  *ret;
 	FILE *file = NULL;
@@ -138,8 +138,8 @@ BIO
 	return (ret);
 }
 
-BIO
-*BIO_new_fp(FILE *stream, int close_flag)
+BIO *
+BIO_new_fp(FILE *stream, int close_flag)
 {
 	BIO *ret;
 
@@ -150,8 +150,8 @@ BIO
 	return (ret);
 }
 
-BIO_METHOD
-*BIO_s_file(void)
+BIO_METHOD *
+BIO_s_file(void)
 {
 	return (&methods_filep);
 }
diff --git a/src/lib/libcrypto/bio/bss_log.c b/src/lib/libcrypto/bio/bss_log.c
index cde3c858f1..342176f82e 100644
--- a/src/lib/libcrypto/bio/bss_log.c
+++ b/src/lib/libcrypto/bio/bss_log.c
@@ -97,8 +97,8 @@ static BIO_METHOD methods_slg = {
 	NULL,
 };
 
-BIO_METHOD
-*BIO_s_log(void)
+BIO_METHOD *
+BIO_s_log(void)
 {
 	return (&methods_slg);
 }
diff --git a/src/lib/libcrypto/bio/bss_mem.c b/src/lib/libcrypto/bio/bss_mem.c
index a5192202bd..1a477c12be 100644
--- a/src/lib/libcrypto/bio/bss_mem.c
+++ b/src/lib/libcrypto/bio/bss_mem.c
@@ -85,14 +85,14 @@ static BIO_METHOD mem_method = {
 /* bio->num is used to hold the value to return on 'empty', if it is
  * 0, should_retry is not set */
 
-BIO_METHOD
-*BIO_s_mem(void)
+BIO_METHOD *
+BIO_s_mem(void)
 {
 	return (&mem_method);
 }
 
-BIO
-*BIO_new_mem_buf(void *buf, int len)
+BIO *
+BIO_new_mem_buf(void *buf, int len)
 {
 	BIO *ret;
 	BUF_MEM *b;
diff --git a/src/lib/libcrypto/bio/bss_null.c b/src/lib/libcrypto/bio/bss_null.c
index 51aed2ac4b..c7289725d9 100644
--- a/src/lib/libcrypto/bio/bss_null.c
+++ b/src/lib/libcrypto/bio/bss_null.c
@@ -82,8 +82,8 @@ static BIO_METHOD null_method = {
 	NULL,
 };
 
-BIO_METHOD
-*BIO_s_null(void)
+BIO_METHOD *
+BIO_s_null(void)
 {
 	return (&null_method);
 }
diff --git a/src/lib/libcrypto/bio/bss_sock.c b/src/lib/libcrypto/bio/bss_sock.c
index b9cf817a0c..5335495c6e 100644
--- a/src/lib/libcrypto/bio/bss_sock.c
+++ b/src/lib/libcrypto/bio/bss_sock.c
@@ -86,14 +86,14 @@ static BIO_METHOD methods_sockp = {
 	NULL,
 };
 
-BIO_METHOD
-*BIO_s_socket(void)
+BIO_METHOD *
+BIO_s_socket(void)
 {
 	return (&methods_sockp);
 }
 
-BIO
-*BIO_new_socket(int fd, int close_flag)
+BIO *
+BIO_new_socket(int fd, int close_flag)
 {
 	BIO *ret;
 
-- 
cgit v1.2.3-55-g6feb