diff options
Diffstat (limited to 'src/util/support/errors.c')
| -rw-r--r-- | src/util/support/errors.c | 32 |
1 files changed, 1 insertions, 31 deletions
diff --git a/src/util/support/errors.c b/src/util/support/errors.c index d820873e2..74093a56a 100644 --- a/src/util/support/errors.c +++ b/src/util/support/errors.c @@ -40,38 +40,19 @@ krb5int_err_init (void) #define lock() k5_mutex_lock(&krb5int_error_info_support_mutex) #define unlock() k5_mutex_unlock(&krb5int_error_info_support_mutex) -#undef k5_set_error void k5_set_error(struct errinfo *ep, long code, const char *fmt, ...) { va_list args; va_start(args, fmt); - k5_vset_error_fl(ep, code, NULL, 0, fmt, args); - va_end(args); -} - -void -k5_set_error_fl(struct errinfo *ep, long code, const char *file, int line, - const char *fmt, ...) -{ - va_list args; - - va_start(args, fmt); - k5_vset_error_fl(ep, code, file, line, fmt, args); + k5_vset_error(ep, code, fmt, args); va_end(args); } void k5_vset_error(struct errinfo *ep, long code, const char *fmt, va_list args) { - k5_vset_error_fl(ep, code, NULL, 0, fmt, args); -} - -void -k5_vset_error_fl(struct errinfo *ep, long code, const char *file, int line, - const char *fmt, va_list args) -{ char *str, *slash; k5_clear_error(ep); @@ -80,17 +61,6 @@ k5_vset_error_fl(struct errinfo *ep, long code, const char *file, int line, if (vasprintf(&str, fmt, args) < 0) return; ep->msg = str; - - if (line) { - /* Try to add file and line suffix. */ - slash = strrchr(file, '/'); - if (slash) - file = slash + 1; - if (asprintf(&str, "%s (%s: %d)", ep->msg, file, line) > 0) { - free(ep->msg); - ep->msg = str; - } - } } static inline const char * |