oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

Allow NULL context.

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@3305 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Johan Danielsson
1997-08-31 15:45:03 +00:00
parent ecfcfb6d06
commit cf839760d3
1 changed files with 17 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
lib/krb5/warn.c
View File

@@ -42,8 +42,8 @@
RCSID("$Id$"); RCSID("$Id$");
static krb5_error_code static krb5_error_code
_warnerr(krb5_context context, int doexit, int eval, int do_errtext, krb5_error_code code, _warnerr(krb5_context context, int doexit, int eval, int do_errtext,
int level, const char *fmt, va_list ap) krb5_error_code code, int level, const char *fmt, va_list ap)
{ {
char xfmt[7] = ""; char xfmt[7] = "";
const char *args[2], **arg; const char *args[2], **arg;
@@ -59,12 +59,12 @@ _warnerr(krb5_context context, int doexit, int eval, int do_errtext, krb5_error_
return ENOMEM; return ENOMEM;
*arg++ = msg; *arg++ = msg;
} }
if(do_errtext){ if(context && do_errtext){
strcat(xfmt, "%s"); strcat(xfmt, "%s");
*arg++ = krb5_get_err_text(context, code); *arg++ = krb5_get_err_text(context, code);
} }
if(context->warn_dest) if(context && context->warn_dest)
krb5_log(context, context->warn_dest, level, xfmt, args[0], args[1]); krb5_log(context, context->warn_dest, level, xfmt, args[0], args[1]);
else else
warnx(xfmt, args[0], args[1]); warnx(xfmt, args[0], args[1]);
@@ -74,16 +74,17 @@ _warnerr(krb5_context context, int doexit, int eval, int do_errtext, krb5_error_
return 0; return 0;
} }
#define FUNC(DO_EXIT, EVAL, DO_ERRTEXT, CODE, LEVEL) \ #define FUNC(EXIT, EVAL, ETEXT, CODE, LEVEL) \
krb5_error_code ret; \ krb5_error_code ret; \
va_list ap; \ va_list ap; \
va_start(ap, fmt); \ va_start(ap, fmt); \
ret = _warnerr(context, DO_EXIT, EVAL, DO_ERRTEXT, CODE, LEVEL, fmt, ap); \ ret = _warnerr(context, EXIT, EVAL, ETEXT, CODE, LEVEL, fmt, ap); \
va_end(ap); \ va_end(ap); \
return ret; return ret;
krb5_error_code krb5_error_code
krb5_vwarn(krb5_context context, krb5_error_code code, const char *fmt, va_list ap) krb5_vwarn(krb5_context context, krb5_error_code code,
const char *fmt, va_list ap)
{ {
return _warnerr(context, 0, 0, 1, code, 1, fmt, ap); return _warnerr(context, 0, 0, 1, code, 1, fmt, ap);
} }
@@ -108,14 +109,16 @@ krb5_warnx(krb5_context context, const char *fmt, ...)
} }
krb5_error_code krb5_error_code
krb5_verr(krb5_context context, int eval, krb5_error_code code, const char *fmt, va_list ap) krb5_verr(krb5_context context, int eval, krb5_error_code code,
const char *fmt, va_list ap)
{ {
return _warnerr(context, 1, eval, 1, code, 0, fmt, ap); return _warnerr(context, 1, eval, 1, code, 0, fmt, ap);
} }
krb5_error_code krb5_error_code
krb5_err(krb5_context context, int eval, krb5_error_code code, const char *fmt, ...) krb5_err(krb5_context context, int eval, krb5_error_code code,
const char *fmt, ...)
{ {
FUNC(1, eval, 1, code, 0); FUNC(1, eval, 1, code, 0);
} }