diff options
author | schwarze <> | 2023-11-16 20:19:23 +0000 |
---|---|---|
committer | schwarze <> | 2023-11-16 20:19:23 +0000 |
commit | 21c26388f56718f5319b42c16da8ba45dfa49365 (patch) | |
tree | 4b75b6e21d61ee0e42e31a38d02dad9d93198522 | |
parent | f712e6220fa1ace65db95528d4a7abac926754a3 (diff) | |
download | openbsd-21c26388f56718f5319b42c16da8ba45dfa49365.tar.gz openbsd-21c26388f56718f5319b42c16da8ba45dfa49365.tar.bz2 openbsd-21c26388f56718f5319b42c16da8ba45dfa49365.zip |
drop some duplicate statements about macros
-rw-r--r-- | src/lib/libcrypto/man/BIO_ctrl.3 | 9 | ||||
-rw-r--r-- | src/lib/libcrypto/man/BIO_s_fd.3 | 6 | ||||
-rw-r--r-- | src/lib/libcrypto/man/BIO_s_file.3 | 10 | ||||
-rw-r--r-- | src/lib/libcrypto/man/BIO_s_mem.3 | 8 |
4 files changed, 10 insertions, 23 deletions
diff --git a/src/lib/libcrypto/man/BIO_ctrl.3 b/src/lib/libcrypto/man/BIO_ctrl.3 index d4515ea9ad..2c537956e1 100644 --- a/src/lib/libcrypto/man/BIO_ctrl.3 +++ b/src/lib/libcrypto/man/BIO_ctrl.3 | |||
@@ -1,4 +1,4 @@ | |||
1 | .\" $OpenBSD: BIO_ctrl.3,v 1.24 2023/07/26 20:01:04 tb Exp $ | 1 | .\" $OpenBSD: BIO_ctrl.3,v 1.25 2023/11/16 20:19:23 schwarze Exp $ |
2 | .\" full merge up to: OpenSSL 24a535eaf Tue Sep 22 13:14:20 2020 +0100 | 2 | .\" full merge up to: OpenSSL 24a535eaf Tue Sep 22 13:14:20 2020 +0100 |
3 | .\" selective merge up to: OpenSSL 0c5bc96f Tue Mar 15 13:57:22 2022 +0000 | 3 | .\" selective merge up to: OpenSSL 0c5bc96f Tue Mar 15 13:57:22 2022 +0000 |
4 | .\" | 4 | .\" |
@@ -66,7 +66,7 @@ | |||
66 | .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED | 66 | .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED |
67 | .\" OF THE POSSIBILITY OF SUCH DAMAGE. | 67 | .\" OF THE POSSIBILITY OF SUCH DAMAGE. |
68 | .\" | 68 | .\" |
69 | .Dd $Mdocdate: July 26 2023 $ | 69 | .Dd $Mdocdate: November 16 2023 $ |
70 | .Dt BIO_CTRL 3 | 70 | .Dt BIO_CTRL 3 |
71 | .Os | 71 | .Os |
72 | .Sh NAME | 72 | .Sh NAME |
@@ -307,11 +307,6 @@ and | |||
307 | return a | 307 | return a |
308 | .Vt size_t | 308 | .Vt size_t |
309 | type and are functions. | 309 | type and are functions. |
310 | .Fn BIO_pending | ||
311 | and | ||
312 | .Fn BIO_wpending | ||
313 | are macros which call | ||
314 | .Fn BIO_ctrl . | ||
315 | .Pp | 310 | .Pp |
316 | .Fn BIO_set_info_callback | 311 | .Fn BIO_set_info_callback |
317 | installs the function pointer | 312 | installs the function pointer |
diff --git a/src/lib/libcrypto/man/BIO_s_fd.3 b/src/lib/libcrypto/man/BIO_s_fd.3 index de5d5d7007..852a06756a 100644 --- a/src/lib/libcrypto/man/BIO_s_fd.3 +++ b/src/lib/libcrypto/man/BIO_s_fd.3 | |||
@@ -1,4 +1,4 @@ | |||
1 | .\" $OpenBSD: BIO_s_fd.3,v 1.12 2023/04/29 12:04:54 schwarze Exp $ | 1 | .\" $OpenBSD: BIO_s_fd.3,v 1.13 2023/11/16 20:19:23 schwarze Exp $ |
2 | .\" full merge up to: OpenSSL 99d63d46 Oct 26 13:56:48 2016 -0400 | 2 | .\" full merge up to: OpenSSL 99d63d46 Oct 26 13:56:48 2016 -0400 |
3 | .\" | 3 | .\" |
4 | .\" This file is a derived work. | 4 | .\" This file is a derived work. |
@@ -65,7 +65,7 @@ | |||
65 | .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED | 65 | .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED |
66 | .\" OF THE POSSIBILITY OF SUCH DAMAGE. | 66 | .\" OF THE POSSIBILITY OF SUCH DAMAGE. |
67 | .\" | 67 | .\" |
68 | .Dd $Mdocdate: April 29 2023 $ | 68 | .Dd $Mdocdate: November 16 2023 $ |
69 | .Dt BIO_S_FD 3 | 69 | .Dt BIO_S_FD 3 |
70 | .Os | 70 | .Os |
71 | .Sh NAME | 71 | .Sh NAME |
@@ -147,7 +147,6 @@ to | |||
147 | .Fa fd | 147 | .Fa fd |
148 | and the close flag to | 148 | and the close flag to |
149 | .Fa close_flag . | 149 | .Fa close_flag . |
150 | It is currently implemented as a macro. | ||
151 | .Pp | 150 | .Pp |
152 | .Fn BIO_get_fd | 151 | .Fn BIO_get_fd |
153 | places the file descriptor in | 152 | places the file descriptor in |
@@ -155,7 +154,6 @@ places the file descriptor in | |||
155 | if it is not | 154 | if it is not |
156 | .Dv NULL | 155 | .Dv NULL |
157 | and also returns the file descriptor. | 156 | and also returns the file descriptor. |
158 | It is currently implemented as a macro. | ||
159 | .Pp | 157 | .Pp |
160 | .Fn BIO_new_fd | 158 | .Fn BIO_new_fd |
161 | returns a file descriptor BIO using | 159 | returns a file descriptor BIO using |
diff --git a/src/lib/libcrypto/man/BIO_s_file.3 b/src/lib/libcrypto/man/BIO_s_file.3 index 7b58903123..14950cad13 100644 --- a/src/lib/libcrypto/man/BIO_s_file.3 +++ b/src/lib/libcrypto/man/BIO_s_file.3 | |||
@@ -1,4 +1,4 @@ | |||
1 | .\" $OpenBSD: BIO_s_file.3,v 1.16 2023/05/01 07:04:38 jsg Exp $ | 1 | .\" $OpenBSD: BIO_s_file.3,v 1.17 2023/11/16 20:19:23 schwarze Exp $ |
2 | .\" full merge up to: OpenSSL 99d63d46 Oct 26 13:56:48 2016 -0400 | 2 | .\" full merge up to: OpenSSL 99d63d46 Oct 26 13:56:48 2016 -0400 |
3 | .\" selective merge up to: OpenSSL 1212818e Sep 11 13:22:14 2018 +0100 | 3 | .\" selective merge up to: OpenSSL 1212818e Sep 11 13:22:14 2018 +0100 |
4 | .\" | 4 | .\" |
@@ -66,7 +66,7 @@ | |||
66 | .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED | 66 | .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED |
67 | .\" OF THE POSSIBILITY OF SUCH DAMAGE. | 67 | .\" OF THE POSSIBILITY OF SUCH DAMAGE. |
68 | .\" | 68 | .\" |
69 | .Dd $Mdocdate: May 1 2023 $ | 69 | .Dd $Mdocdate: November 16 2023 $ |
70 | .Dt BIO_S_FILE 3 | 70 | .Dt BIO_S_FILE 3 |
71 | .Os | 71 | .Os |
72 | .Sh NAME | 72 | .Sh NAME |
@@ -196,14 +196,12 @@ sets the file pointer of a file BIO to | |||
196 | .Fa flags | 196 | .Fa flags |
197 | has the same meaning as in | 197 | has the same meaning as in |
198 | .Fn BIO_new_fp . | 198 | .Fn BIO_new_fp . |
199 | .Fn BIO_set_fp | ||
200 | is a macro. | ||
201 | .Pp | 199 | .Pp |
202 | .Fn BIO_get_fp | 200 | .Fn BIO_get_fp |
203 | retrieves the file pointer of a file BIO, it is a macro. | 201 | retrieves the file pointer of a file BIO. |
204 | .Pp | 202 | .Pp |
205 | .Xr BIO_seek 3 | 203 | .Xr BIO_seek 3 |
206 | is a macro that sets the position pointer to | 204 | sets the position pointer to |
207 | .Fa offset | 205 | .Fa offset |
208 | bytes from the start of file. | 206 | bytes from the start of file. |
209 | .Pp | 207 | .Pp |
diff --git a/src/lib/libcrypto/man/BIO_s_mem.3 b/src/lib/libcrypto/man/BIO_s_mem.3 index 475cd8869f..d7bbf6af43 100644 --- a/src/lib/libcrypto/man/BIO_s_mem.3 +++ b/src/lib/libcrypto/man/BIO_s_mem.3 | |||
@@ -1,4 +1,4 @@ | |||
1 | .\" $OpenBSD: BIO_s_mem.3,v 1.18 2023/04/29 12:04:54 schwarze Exp $ | 1 | .\" $OpenBSD: BIO_s_mem.3,v 1.19 2023/11/16 20:19:23 schwarze Exp $ |
2 | .\" full merge up to: OpenSSL 8711efb4 Mon Apr 20 11:33:12 2009 +0000 | 2 | .\" full merge up to: OpenSSL 8711efb4 Mon Apr 20 11:33:12 2009 +0000 |
3 | .\" selective merge up to: OpenSSL 36359cec Mar 7 14:37:23 2018 +0100 | 3 | .\" selective merge up to: OpenSSL 36359cec Mar 7 14:37:23 2018 +0100 |
4 | .\" | 4 | .\" |
@@ -49,7 +49,7 @@ | |||
49 | .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED | 49 | .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED |
50 | .\" OF THE POSSIBILITY OF SUCH DAMAGE. | 50 | .\" OF THE POSSIBILITY OF SUCH DAMAGE. |
51 | .\" | 51 | .\" |
52 | .Dd $Mdocdate: April 29 2023 $ | 52 | .Dd $Mdocdate: November 16 2023 $ |
53 | .Dt BIO_S_MEM 3 | 53 | .Dt BIO_S_MEM 3 |
54 | .Os | 54 | .Os |
55 | .Sh NAME | 55 | .Sh NAME |
@@ -158,7 +158,6 @@ sets | |||
158 | .Pf * Fa pp | 158 | .Pf * Fa pp |
159 | to a pointer to the start of the memory BIO's data | 159 | to a pointer to the start of the memory BIO's data |
160 | and returns the total amount of data available. | 160 | and returns the total amount of data available. |
161 | It is implemented as a macro. | ||
162 | .Pp | 161 | .Pp |
163 | .Fn BIO_set_mem_buf | 162 | .Fn BIO_set_mem_buf |
164 | sets the internal BUF_MEM structure to | 163 | sets the internal BUF_MEM structure to |
@@ -171,15 +170,12 @@ should be either | |||
171 | .Dv BIO_CLOSE | 170 | .Dv BIO_CLOSE |
172 | or | 171 | or |
173 | .Dv BIO_NOCLOSE . | 172 | .Dv BIO_NOCLOSE . |
174 | .Fn BIO_set_mem_buf | ||
175 | is a macro. | ||
176 | .Pp | 173 | .Pp |
177 | .Fn BIO_get_mem_ptr | 174 | .Fn BIO_get_mem_ptr |
178 | places the underlying | 175 | places the underlying |
179 | .Vt BUF_MEM | 176 | .Vt BUF_MEM |
180 | structure in | 177 | structure in |
181 | .Pf * Fa pp . | 178 | .Pf * Fa pp . |
182 | It is a macro. | ||
183 | .Pp | 179 | .Pp |
184 | .Fn BIO_new_mem_buf | 180 | .Fn BIO_new_mem_buf |
185 | creates a memory BIO using | 181 | creates a memory BIO using |