summaryrefslogtreecommitdiff
path: root/src/lib/libcrypto/err/err.c
diff options
context:
space:
mode:
authorbeck <>2017-02-20 23:21:19 +0000
committerbeck <>2017-02-20 23:21:19 +0000
commit0179324cb8e49724e624c4a6c35de46c975416d4 (patch)
tree72f034bdca67cf5c4c20f03eb985bcaf9e3f89ef /src/lib/libcrypto/err/err.c
parent6cb36c9d835e1348d93099b63bcdaf2a02c38532 (diff)
downloadopenbsd-0179324cb8e49724e624c4a6c35de46c975416d4.tar.gz
openbsd-0179324cb8e49724e624c4a6c35de46c975416d4.tar.bz2
openbsd-0179324cb8e49724e624c4a6c35de46c975416d4.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.c19
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}
1095void
1096ERR_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
1104void 1096void
1105ERR_add_error_vdata(int num, va_list args) 1097ERR_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
1116void
1117ERR_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
1124int 1125int
1125ERR_set_mark(void) 1126ERR_set_mark(void)
1126{ 1127{