diff options
author | jsing <> | 2014-04-21 14:50:59 +0000 |
---|---|---|
committer | jsing <> | 2014-04-21 14:50:59 +0000 |
commit | 4a1cabf252e81d8cf554c92fe0d6b88aa14cf747 (patch) | |
tree | c72a444a0794628ca063d111124d9785765f8db9 /src/lib/libcrypto/err/err.h | |
parent | ac499e34042be918cb0f1f53989f22ef20948783 (diff) | |
download | openbsd-4a1cabf252e81d8cf554c92fe0d6b88aa14cf747.tar.gz openbsd-4a1cabf252e81d8cf554c92fe0d6b88aa14cf747.tar.bz2 openbsd-4a1cabf252e81d8cf554c92fe0d6b88aa14cf747.zip |
KNF.
Diffstat (limited to '')
-rw-r--r-- | src/lib/libcrypto/err/err.h | 56 |
1 files changed, 27 insertions, 29 deletions
diff --git a/src/lib/libcrypto/err/err.h b/src/lib/libcrypto/err/err.h index 974cc9cc6f..87dfef2456 100644 --- a/src/lib/libcrypto/err/err.h +++ b/src/lib/libcrypto/err/err.h | |||
@@ -5,21 +5,21 @@ | |||
5 | * This package is an SSL implementation written | 5 | * This package is an SSL implementation written |
6 | * by Eric Young (eay@cryptsoft.com). | 6 | * by Eric Young (eay@cryptsoft.com). |
7 | * The implementation was written so as to conform with Netscapes SSL. | 7 | * The implementation was written so as to conform with Netscapes SSL. |
8 | * | 8 | * |
9 | * This library is free for commercial and non-commercial use as long as | 9 | * This library is free for commercial and non-commercial use as long as |
10 | * the following conditions are aheared to. The following conditions | 10 | * the following conditions are aheared to. The following conditions |
11 | * apply to all code found in this distribution, be it the RC4, RSA, | 11 | * apply to all code found in this distribution, be it the RC4, RSA, |
12 | * lhash, DES, etc., code; not just the SSL code. The SSL documentation | 12 | * lhash, DES, etc., code; not just the SSL code. The SSL documentation |
13 | * included with this distribution is covered by the same copyright terms | 13 | * included with this distribution is covered by the same copyright terms |
14 | * except that the holder is Tim Hudson (tjh@cryptsoft.com). | 14 | * except that the holder is Tim Hudson (tjh@cryptsoft.com). |
15 | * | 15 | * |
16 | * Copyright remains Eric Young's, and as such any Copyright notices in | 16 | * Copyright remains Eric Young's, and as such any Copyright notices in |
17 | * the code are not to be removed. | 17 | * the code are not to be removed. |
18 | * If this package is used in a product, Eric Young should be given attribution | 18 | * If this package is used in a product, Eric Young should be given attribution |
19 | * as the author of the parts of the library used. | 19 | * as the author of the parts of the library used. |
20 | * This can be in the form of a textual message at program startup or | 20 | * This can be in the form of a textual message at program startup or |
21 | * in documentation (online or textual) provided with the package. | 21 | * in documentation (online or textual) provided with the package. |
22 | * | 22 | * |
23 | * Redistribution and use in source and binary forms, with or without | 23 | * Redistribution and use in source and binary forms, with or without |
24 | * modification, are permitted provided that the following conditions | 24 | * modification, are permitted provided that the following conditions |
25 | * are met: | 25 | * are met: |
@@ -34,10 +34,10 @@ | |||
34 | * Eric Young (eay@cryptsoft.com)" | 34 | * Eric Young (eay@cryptsoft.com)" |
35 | * The word 'cryptographic' can be left out if the rouines from the library | 35 | * The word 'cryptographic' can be left out if the rouines from the library |
36 | * being used are not cryptographic related :-). | 36 | * being used are not cryptographic related :-). |
37 | * 4. If you include any Windows specific code (or a derivative thereof) from | 37 | * 4. If you include any Windows specific code (or a derivative thereof) from |
38 | * the apps directory (application code) you must include an acknowledgement: | 38 | * the apps directory (application code) you must include an acknowledgement: |
39 | * "This product includes software written by Tim Hudson (tjh@cryptsoft.com)" | 39 | * "This product includes software written by Tim Hudson (tjh@cryptsoft.com)" |
40 | * | 40 | * |
41 | * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND | 41 | * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND |
42 | * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | 42 | * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE |
43 | * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE | 43 | * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE |
@@ -49,7 +49,7 @@ | |||
49 | * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY | 49 | * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY |
50 | * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF | 50 | * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF |
51 | * SUCH DAMAGE. | 51 | * SUCH DAMAGE. |
52 | * | 52 | * |
53 | * The licence and distribution terms for any publically available version or | 53 | * The licence and distribution terms for any publically available version or |
54 | * derivative of this code cannot be changed. i.e. this code cannot simply be | 54 | * derivative of this code cannot be changed. i.e. this code cannot simply be |
55 | * copied and put under another distribution licence | 55 | * copied and put under another distribution licence |
@@ -63,7 +63,7 @@ | |||
63 | * are met: | 63 | * are met: |
64 | * | 64 | * |
65 | * 1. Redistributions of source code must retain the above copyright | 65 | * 1. Redistributions of source code must retain the above copyright |
66 | * notice, this list of conditions and the following disclaimer. | 66 | * notice, this list of conditions and the following disclaimer. |
67 | * | 67 | * |
68 | * 2. Redistributions in binary form must reproduce the above copyright | 68 | * 2. Redistributions in binary form must reproduce the above copyright |
69 | * notice, this list of conditions and the following disclaimer in | 69 | * notice, this list of conditions and the following disclaimer in |
@@ -145,8 +145,7 @@ extern "C" { | |||
145 | #define ERR_FLAG_MARK 0x01 | 145 | #define ERR_FLAG_MARK 0x01 |
146 | 146 | ||
147 | #define ERR_NUM_ERRORS 16 | 147 | #define ERR_NUM_ERRORS 16 |
148 | typedef struct err_state_st | 148 | typedef struct err_state_st { |
149 | { | ||
150 | CRYPTO_THREADID tid; | 149 | CRYPTO_THREADID tid; |
151 | int err_flags[ERR_NUM_ERRORS]; | 150 | int err_flags[ERR_NUM_ERRORS]; |
152 | unsigned long err_buffer[ERR_NUM_ERRORS]; | 151 | unsigned long err_buffer[ERR_NUM_ERRORS]; |
@@ -154,8 +153,8 @@ typedef struct err_state_st | |||
154 | int err_data_flags[ERR_NUM_ERRORS]; | 153 | int err_data_flags[ERR_NUM_ERRORS]; |
155 | const char *err_file[ERR_NUM_ERRORS]; | 154 | const char *err_file[ERR_NUM_ERRORS]; |
156 | int err_line[ERR_NUM_ERRORS]; | 155 | int err_line[ERR_NUM_ERRORS]; |
157 | int top,bottom; | 156 | int top, bottom; |
158 | } ERR_STATE; | 157 | } ERR_STATE; |
159 | 158 | ||
160 | /* library */ | 159 | /* library */ |
161 | #define ERR_LIB_NONE 1 | 160 | #define ERR_LIB_NONE 1 |
@@ -310,35 +309,34 @@ typedef struct err_state_st | |||
310 | * are reserved for the individual libraries */ | 309 | * are reserved for the individual libraries */ |
311 | 310 | ||
312 | 311 | ||
313 | typedef struct ERR_string_data_st | 312 | typedef struct ERR_string_data_st { |
314 | { | ||
315 | unsigned long error; | 313 | unsigned long error; |
316 | const char *string; | 314 | const char *string; |
317 | } ERR_STRING_DATA; | 315 | } ERR_STRING_DATA; |
318 | 316 | ||
319 | void ERR_put_error(int lib, int func,int reason,const char *file,int line); | 317 | void ERR_put_error(int lib, int func, int reason, const char *file, int line); |
320 | void ERR_set_error_data(char *data,int flags); | 318 | void ERR_set_error_data(char *data, int flags); |
321 | 319 | ||
322 | unsigned long ERR_get_error(void); | 320 | unsigned long ERR_get_error(void); |
323 | unsigned long ERR_get_error_line(const char **file,int *line); | 321 | unsigned long ERR_get_error_line(const char **file, int *line); |
324 | unsigned long ERR_get_error_line_data(const char **file,int *line, | 322 | unsigned long ERR_get_error_line_data(const char **file, int *line, |
325 | const char **data, int *flags); | 323 | const char **data, int *flags); |
326 | unsigned long ERR_peek_error(void); | 324 | unsigned long ERR_peek_error(void); |
327 | unsigned long ERR_peek_error_line(const char **file,int *line); | 325 | unsigned long ERR_peek_error_line(const char **file, int *line); |
328 | unsigned long ERR_peek_error_line_data(const char **file,int *line, | 326 | unsigned long ERR_peek_error_line_data(const char **file, int *line, |
329 | const char **data,int *flags); | 327 | const char **data, int *flags); |
330 | unsigned long ERR_peek_last_error(void); | 328 | unsigned long ERR_peek_last_error(void); |
331 | unsigned long ERR_peek_last_error_line(const char **file,int *line); | 329 | unsigned long ERR_peek_last_error_line(const char **file, int *line); |
332 | unsigned long ERR_peek_last_error_line_data(const char **file,int *line, | 330 | unsigned long ERR_peek_last_error_line_data(const char **file, int *line, |
333 | const char **data,int *flags); | 331 | const char **data, int *flags); |
334 | void ERR_clear_error(void ); | 332 | void ERR_clear_error(void ); |
335 | char *ERR_error_string(unsigned long e,char *buf); | 333 | char *ERR_error_string(unsigned long e, char *buf); |
336 | void ERR_error_string_n(unsigned long e, char *buf, size_t len); | 334 | void ERR_error_string_n(unsigned long e, char *buf, size_t len); |
337 | const char *ERR_lib_error_string(unsigned long e); | 335 | const char *ERR_lib_error_string(unsigned long e); |
338 | const char *ERR_func_error_string(unsigned long e); | 336 | const char *ERR_func_error_string(unsigned long e); |
339 | const char *ERR_reason_error_string(unsigned long e); | 337 | const char *ERR_reason_error_string(unsigned long e); |
340 | void ERR_print_errors_cb(int (*cb)(const char *str, size_t len, void *u), | 338 | void ERR_print_errors_cb(int (*cb)(const char *str, size_t len, void *u), |
341 | void *u); | 339 | void *u); |
342 | #ifndef OPENSSL_NO_FP_API | 340 | #ifndef OPENSSL_NO_FP_API |
343 | void ERR_print_errors_fp(FILE *fp); | 341 | void ERR_print_errors_fp(FILE *fp); |
344 | #endif | 342 | #endif |
@@ -347,8 +345,8 @@ void ERR_print_errors(BIO *bp); | |||
347 | #endif | 345 | #endif |
348 | void ERR_add_error_data(int num, ...); | 346 | void ERR_add_error_data(int num, ...); |
349 | void ERR_add_error_vdata(int num, va_list args); | 347 | void ERR_add_error_vdata(int num, va_list args); |
350 | void ERR_load_strings(int lib,ERR_STRING_DATA str[]); | 348 | void ERR_load_strings(int lib, ERR_STRING_DATA str[]); |
351 | void ERR_unload_strings(int lib,ERR_STRING_DATA str[]); | 349 | void ERR_unload_strings(int lib, ERR_STRING_DATA str[]); |
352 | void ERR_load_ERR_strings(void); | 350 | void ERR_load_ERR_strings(void); |
353 | void ERR_load_crypto_strings(void); | 351 | void ERR_load_crypto_strings(void); |
354 | void ERR_free_strings(void); | 352 | void ERR_free_strings(void); |