From 6da738ff96a2d8aec8e39a8b81e9f83fff0f22e2 Mon Sep 17 00:00:00 2001 From: Johan Danielsson Date: Fri, 8 Aug 1997 02:54:06 +0000 Subject: [PATCH] krb5_vwarn* git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@2778 ec53bebd-3082-4978-b11e-865c3cabbd6b --- lib/krb5/warn.c | 28 ++++++++++++++++++++++------ 1 file changed, 22 insertions(+), 6 deletions(-) diff --git a/lib/krb5/warn.c b/lib/krb5/warn.c index b83d2a18d..06bf0048e 100644 --- a/lib/krb5/warn.c +++ b/lib/krb5/warn.c @@ -43,13 +43,10 @@ RCSID("$Id$"); krb5_error_code -krb5_warn(krb5_context context, krb5_error_code code, const char *fmt, ...) +krb5_vwarn(krb5_context context, krb5_error_code code, const char *fmt, va_list ap) { char *msg; - va_list ap; - va_start(ap, fmt); vasprintf(&msg, fmt, ap); - va_end(ap); if(msg == NULL) return ENOMEM; if(context->warn_dest) @@ -62,18 +59,37 @@ krb5_warn(krb5_context context, krb5_error_code code, const char *fmt, ...) } krb5_error_code -krb5_warnx(krb5_context context, const char *fmt, ...) +krb5_warn(krb5_context context, krb5_error_code code, const char *fmt, ...) { + krb5_error_code ret; va_list ap; va_start(ap, fmt); + ret = krb5_vwarn(context, code, fmt, ap); + va_end(ap); + return ret; +} + +krb5_error_code +krb5_vwarnx(krb5_context context, const char *fmt, va_list ap) +{ if(context->warn_dest) krb5_vlog(context, context->warn_dest, 0, fmt, ap); else vwarnx(fmt, ap); - va_end(ap); return 0; } +krb5_error_code +krb5_warnx(krb5_context context, const char *fmt, ...) +{ + krb5_error_code ret; + va_list ap; + va_start(ap, fmt); + ret = krb5_vwarnx(context, fmt, ap); + va_end(ap); + return ret; +} + krb5_error_code krb5_set_warn_dest(krb5_context context, krb5_log_facility *fac) {