diff options
| author | Greg Hudson <ghudson@mit.edu> | 2012-10-20 16:52:29 -0400 |
|---|---|---|
| committer | Greg Hudson <ghudson@mit.edu> | 2012-12-19 12:15:46 -0500 |
| commit | d9abacfd82b3336d133d12ed117173a1b6c0ba54 (patch) | |
| tree | 6272f93d8f97ae2c3726a6854777fc4fa357c5ab /src/include | |
| parent | 296c51d3208ddc37b64f5a0b06812e2705995c4b (diff) | |
| download | krb5-d9abacfd82b3336d133d12ed117173a1b6c0ba54.tar.gz krb5-d9abacfd82b3336d133d12ed117173a1b6c0ba54.tar.xz krb5-d9abacfd82b3336d133d12ed117173a1b6c0ba54.zip | |
Style cleanup for internal error handling
Fix style issues in kerrs.c and errors.c. Rename error handling
functions to use shorter k5_ prefix. Eliminate an inoperable
krb5int_set_error() call in gic_opte_alloc and convert the other
call to use krb5_set_error_message().
Diffstat (limited to 'src/include')
| -rw-r--r-- | src/include/k5-err.h | 42 |
1 files changed, 17 insertions, 25 deletions
diff --git a/src/include/k5-err.h b/src/include/k5-err.h index f9d5b0ce74..b677f19e1c 100644 --- a/src/include/k5-err.h +++ b/src/include/k5-err.h @@ -48,49 +48,41 @@ struct errinfo { char scratch_buf[1024]; }; -void -krb5int_set_error (struct errinfo *ep, - long code, - const char *fmt, ...) +void k5_set_error(struct errinfo *ep, long code, const char *fmt, ...) #if !defined(__cplusplus) && (__GNUC__ > 2) __attribute__((__format__(__printf__, 3, 4))) #endif ; -void -krb5int_vset_error (struct errinfo *ep, long code, - const char *fmt, va_list args) + +void k5_vset_error(struct errinfo *ep, long code, const char *fmt, + va_list args) #if !defined(__cplusplus) && (__GNUC__ > 2) __attribute__((__format__(__printf__, 3, 0))) #endif ; -void -krb5int_set_error_fl (struct errinfo *ep, long code, - const char *file, int line, - const char *fmt, ...) + +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 -krb5int_vset_error_fl (struct errinfo *ep, long code, - const char *file, int line, - const char *fmt, va_list args) + +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 * -krb5int_get_error (struct errinfo *ep, long code); -void -krb5int_free_error (struct errinfo *ep, const char *msg); -void -krb5int_clear_error (struct errinfo *ep); -void -krb5int_set_error_info_callout_fn (const char *(KRB5_CALLCONV *f)(long)); + +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 krb5int_set_error(ep, code, ...) \ - krb5int_set_error_fl(ep, code, __FILE__, __LINE__, __VA_ARGS__) +#define k5_set_error(ep, code, ...) \ + k5_set_error_fl(ep, code, __FILE__, __LINE__, __VA_ARGS__) #endif #endif /* K5_ERR_H */ |