From ba2879ca8f8ba84d2431a9a40de4ac7ee1e758f8 Mon Sep 17 00:00:00 2001 From: Greg Hudson Date: Sat, 24 May 2014 11:35:30 -0400 Subject: Remove DEBUG_ERROR_LOCATIONS support It wasn't being used and it added too much complexity to the error-handling functions. --- src/include/k5-err.h | 19 ------------------- src/include/k5-int.h | 12 ------------ 2 files changed, 31 deletions(-) (limited to 'src/include') diff --git a/src/include/k5-err.h b/src/include/k5-err.h index 083dee4a2..d92920764 100644 --- a/src/include/k5-err.h +++ b/src/include/k5-err.h @@ -61,28 +61,9 @@ void k5_vset_error(struct errinfo *ep, long code, const char *fmt, #endif ; -void k5_set_error_fl(struct errinfo *ep, long code, const char *file, int line, - const char *fmt, ...) -#if !defined(__cplusplus) && (__GNUC__ > 2) - __attribute__((__format__(__printf__, 5, 6))) -#endif - ; - -void k5_vset_error_fl(struct errinfo *ep, long code, const char *file, - int line, const char *fmt, va_list args) -#if !defined(__cplusplus) && (__GNUC__ > 2) - __attribute__((__format__(__printf__, 5, 0))) -#endif - ; - const char *k5_get_error(struct errinfo *ep, long code); void k5_free_error(struct errinfo *ep, const char *msg); void k5_clear_error(struct errinfo *ep); void k5_set_error_info_callout_fn(const char *(KRB5_CALLCONV *f)(long)); -#ifdef DEBUG_ERROR_LOCATIONS -#define k5_set_error(ep, code, ...) \ - k5_set_error_fl(ep, code, __FILE__, __LINE__, __VA_ARGS__) -#endif - #endif /* K5_ERR_H */ diff --git a/src/include/k5-int.h b/src/include/k5-int.h index 187d16df2..3b6aa9c2c 100644 --- a/src/include/k5-int.h +++ b/src/include/k5-int.h @@ -2271,16 +2271,4 @@ krb5_boolean k5_etypes_contains(const krb5_enctype *list, krb5_enctype etype); void k5_change_error_message_code(krb5_context ctx, krb5_error_code oldcode, krb5_error_code newcode); -#ifdef DEBUG_ERROR_LOCATIONS -#define krb5_set_error_message(ctx, code, ...) \ - krb5_set_error_message_fl(ctx, code, __FILE__, __LINE__, __VA_ARGS__) -#endif -void KRB5_CALLCONV_C -krb5_set_error_message_fl(krb5_context ctx, krb5_error_code code, - const char *file, int line, const char *fmt, ...) -#ifdef __GNUC__ - __attribute__((__format__(printf,5,6))) -#endif - ; - #endif /* _KRB5_INT_H */ -- cgit