diff options
| author | Greg Hudson <ghudson@mit.edu> | 2014-07-05 10:23:11 -0400 |
|---|---|---|
| committer | Greg Hudson <ghudson@mit.edu> | 2014-07-08 19:19:24 -0400 |
| commit | 6a8da91b691b8f51ac62d8142cd2fa32a69f3d15 (patch) | |
| tree | 153f2f159c372fa9ea9ecc707e5e59951b66f226 /src/util | |
| parent | 6351586a771e9a99e1e946cc9a0b6a87bbb14094 (diff) | |
| download | krb5-6a8da91b691b8f51ac62d8142cd2fa32a69f3d15.tar.gz krb5-6a8da91b691b8f51ac62d8142cd2fa32a69f3d15.tar.xz krb5-6a8da91b691b8f51ac62d8142cd2fa32a69f3d15.zip | |
Simplify usage of strerror_r
Take advantage of the strerror_r portability wrapper to simplify code
using it. Remove unused macros related to strerror_r in
ldap_service_stash.c and plugins.c.
ticket: 7961
Diffstat (limited to 'src/util')
| -rw-r--r-- | src/util/et/error_message.c | 19 | ||||
| -rw-r--r-- | src/util/support/errors.c | 2 | ||||
| -rw-r--r-- | src/util/support/plugins.c | 9 |
3 files changed, 2 insertions, 28 deletions
diff --git a/src/util/et/error_message.c b/src/util/et/error_message.c index fb72396ce..c4fa5693b 100644 --- a/src/util/et/error_message.c +++ b/src/util/et/error_message.c @@ -30,11 +30,6 @@ #include "error_table.h" #include "k5-platform.h" -#if !defined(HAVE_STRERROR) && !defined(SYS_ERRLIST_DECLARED) -extern char const * const sys_errlist[]; -extern const int sys_nerr; -#endif - static struct et_list *et_list; static k5_mutex_t et_list_lock = K5_MUTEX_PARTIAL_INITIALIZER; static int terminated = 0; /* for debugging shlib fini sequence errors */ @@ -142,20 +137,10 @@ error_message(long code) /* This could trip if int is 16 bits. */ if ((unsigned long)(int)code != (unsigned long)code) abort (); -#ifdef HAVE_STRERROR_R cp = get_thread_buffer(); - if (cp && strerror_r((int) code, cp, ET_EBUFSIZ) == 0) + if (cp && strerror_r(code, cp, ET_EBUFSIZ) == 0) return cp; -#endif -#ifdef HAVE_STRERROR - cp = strerror((int) code); - if (cp) - return cp; -#elif defined HAVE_SYS_ERRLIST - if (offset < sys_nerr) - return(sys_errlist[offset]); -#endif - goto oops; + return strerror(code); } k5_mutex_lock(&et_list_lock); diff --git a/src/util/support/errors.c b/src/util/support/errors.c index 74093a56a..4b1cfa062 100644 --- a/src/util/support/errors.c +++ b/src/util/support/errors.c @@ -84,10 +84,8 @@ k5_get_error(struct errinfo *ep, long code) lock(); if (fptr == NULL) { unlock(); -#ifdef HAVE_STRERROR_R if (strerror_r(code, buf, sizeof(buf)) == 0) return oom_check(strdup(buf)); -#endif return oom_check(strdup(strerror(code))); } r = fptr(code); diff --git a/src/util/support/plugins.c b/src/util/support/plugins.c index ca4b12858..82ef97e57 100644 --- a/src/util/support/plugins.c +++ b/src/util/support/plugins.c @@ -446,15 +446,6 @@ krb5int_close_plugin (struct plugin_file_handle *h) #endif #endif - -#ifdef HAVE_STRERROR_R -#define ERRSTR(ERR, BUF) \ - (strerror_r (ERR, BUF, sizeof(BUF)) == 0 ? BUF : strerror (ERR)) -#else -#define ERRSTR(ERR, BUF) \ - (strerror (ERR)) -#endif - static long krb5int_plugin_file_handle_array_init (struct plugin_file_handle ***harray) { |