diff options
| author | beck <> | 2017-02-20 23:21:19 +0000 |
|---|---|---|
| committer | beck <> | 2017-02-20 23:21:19 +0000 |
| commit | 5426fd8db7d9a7a0c9058fcabf32076cd34bf8be (patch) | |
| tree | 72f034bdca67cf5c4c20f03eb985bcaf9e3f89ef /src/lib/libcrypto/err/err.c | |
| parent | 582ba9a7a226cb073fce3112fe7b427eee4ac197 (diff) | |
| download | openbsd-5426fd8db7d9a7a0c9058fcabf32076cd34bf8be.tar.gz openbsd-5426fd8db7d9a7a0c9058fcabf32076cd34bf8be.tar.bz2 openbsd-5426fd8db7d9a7a0c9058fcabf32076cd34bf8be.zip | |
Mark ERR_add_error_data and ERR_add_error_vdata as not for internal use,
and document ERR_asprintf_error_data as their replacement.
ok jsing@, ingo@
Diffstat (limited to 'src/lib/libcrypto/err/err.c')
| -rw-r--r-- | src/lib/libcrypto/err/err.c | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/src/lib/libcrypto/err/err.c b/src/lib/libcrypto/err/err.c index 1b235c1653..ffe25bf465 100644 --- a/src/lib/libcrypto/err/err.c +++ b/src/lib/libcrypto/err/err.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: err.c,v 1.44 2017/02/07 15:52:33 jsing Exp $ */ | 1 | /* $OpenBSD: err.c,v 1.45 2017/02/20 23:21:19 beck Exp $ */ |
| 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) |
| 3 | * All rights reserved. | 3 | * All rights reserved. |
| 4 | * | 4 | * |
| @@ -1092,14 +1092,6 @@ ERR_asprintf_error_data(char * format, ...) { | |||
| 1092 | else | 1092 | else |
| 1093 | ERR_set_error_data(errbuf, ERR_TXT_MALLOCED|ERR_TXT_STRING); | 1093 | ERR_set_error_data(errbuf, ERR_TXT_MALLOCED|ERR_TXT_STRING); |
| 1094 | } | 1094 | } |
| 1095 | void | ||
| 1096 | ERR_add_error_data(int num, ...) | ||
| 1097 | { | ||
| 1098 | va_list args; | ||
| 1099 | va_start(args, num); | ||
| 1100 | ERR_add_error_vdata(num, args); | ||
| 1101 | va_end(args); | ||
| 1102 | } | ||
| 1103 | 1095 | ||
| 1104 | void | 1096 | void |
| 1105 | ERR_add_error_vdata(int num, va_list args) | 1097 | ERR_add_error_vdata(int num, va_list args) |
| @@ -1121,6 +1113,15 @@ ERR_add_error_vdata(int num, va_list args) | |||
| 1121 | ERR_set_error_data(errbuf, ERR_TXT_MALLOCED|ERR_TXT_STRING); | 1113 | ERR_set_error_data(errbuf, ERR_TXT_MALLOCED|ERR_TXT_STRING); |
| 1122 | } | 1114 | } |
| 1123 | 1115 | ||
| 1116 | void | ||
| 1117 | ERR_add_error_data(int num, ...) | ||
| 1118 | { | ||
| 1119 | va_list args; | ||
| 1120 | va_start(args, num); | ||
| 1121 | ERR_add_error_vdata(num, args); | ||
| 1122 | va_end(args); | ||
| 1123 | } | ||
| 1124 | |||
| 1124 | int | 1125 | int |
| 1125 | ERR_set_mark(void) | 1126 | ERR_set_mark(void) |
| 1126 | { | 1127 | { |
