summaryrefslogtreecommitdiffstats
path: root/crypto/err
diff options
context:
space:
mode:
authorUlf Möller <ulf@openssl.org>1999-05-05 12:35:27 +0000
committerUlf Möller <ulf@openssl.org>1999-05-05 12:35:27 +0000
commit4565c3e36f5d1b74a0bdad03aa5b8c63744340a2 (patch)
treef55007befc849420a37d05af1f8648201a3c2d74 /crypto/err
parent5fd1e150f7db742e64f23c4358deed4cd0863b69 (diff)
Use ANSI stdarg.
Diffstat (limited to 'crypto/err')
-rw-r--r--crypto/err/err.c12
-rw-r--r--crypto/err/err.h2
2 files changed, 7 insertions, 7 deletions
diff --git a/crypto/err/err.c b/crypto/err/err.c
index 34320b375a..47bc5fa6a1 100644
--- a/crypto/err/err.c
+++ b/crypto/err/err.c
@@ -57,6 +57,7 @@
*/
#include <stdio.h>
+#include <stdarg.h>
#include <openssl/lhash.h>
#include <openssl/crypto.h>
#include "cryptlib.h"
@@ -580,10 +581,9 @@ void ERR_set_error_data(char *data, int flags)
es->err_data_flags[es->top]=flags;
}
-void ERR_add_error_data( VAR_PLIST(int , num))
-VAR_ALIST
+void ERR_add_error_data(int num, ...)
{
- VAR_BDEFN(args, int, num);
+ va_list args;
int i,n,s;
char *str,*p,*a;
@@ -592,11 +592,11 @@ VAR_ALIST
if (str == NULL) return;
str[0]='\0';
- VAR_INIT(args,int,num);
+ va_start(args, num);
n=0;
for (i=0; i<num; i++)
{
- VAR_ARG(args,char *,a);
+ a=va_arg(args, char*);
/* ignore NULLs, thanks to Bob Beck <beck@obtuse.com> */
if (a != NULL)
{
@@ -618,6 +618,6 @@ VAR_ALIST
}
ERR_set_error_data(str,ERR_TXT_MALLOCED|ERR_TXT_STRING);
- VAR_END( args );
+ va_end(args);
}
diff --git a/crypto/err/err.h b/crypto/err/err.h
index c7b3921037..0ef83d5ead 100644
--- a/crypto/err/err.h
+++ b/crypto/err/err.h
@@ -235,7 +235,7 @@ void ERR_print_errors_fp(FILE *fp);
#endif
#ifdef HEADER_BIO_H
void ERR_print_errors(BIO *bp);
-void ERR_add_error_data( VAR_PLIST( int, num ) );
+void ERR_add_error_data(int num, ...);
#endif
void ERR_load_strings(int lib,ERR_STRING_DATA str[]);
void ERR_load_ERR_strings(void );