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/lib | |
| parent | 6351586a771e9a99e1e946cc9a0b6a87bbb14094 (diff) | |
| download | krb5-6a8da91b691b8f51ac62d8142cd2fa32a69f3d15.zip krb5-6a8da91b691b8f51ac62d8142cd2fa32a69f3d15.tar.gz krb5-6a8da91b691b8f51ac62d8142cd2fa32a69f3d15.tar.bz2 | |
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/lib')
| -rw-r--r-- | src/lib/krb5/os/trace.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/src/lib/krb5/os/trace.c b/src/lib/krb5/os/trace.c index 105a2cd..5fbe573 100644 --- a/src/lib/krb5/os/trace.c +++ b/src/lib/krb5/os/trace.c @@ -229,14 +229,9 @@ trace_format(krb5_context context, const char *fmt, va_list ap) subfmt(context, &buf, "{hexlenstr}", d->length, d->data); } else if (strcmp(tmpbuf, "errno") == 0) { err = va_arg(ap, int); - p = NULL; -#ifdef HAVE_STRERROR_R + k5_buf_add_fmt(&buf, "%d", err); if (strerror_r(err, tmpbuf, sizeof(tmpbuf)) == 0) - p = tmpbuf; -#endif - if (p == NULL) - p = strerror(err); - k5_buf_add_fmt(&buf, "%d/%s", err, p); + k5_buf_add_fmt(&buf, "/%s", tmpbuf); } else if (strcmp(tmpbuf, "kerr") == 0) { kerr = va_arg(ap, krb5_error_code); p = krb5_get_error_message(context, kerr); |