From 6a8da91b691b8f51ac62d8142cd2fa32a69f3d15 Mon Sep 17 00:00:00 2001 From: Greg Hudson Date: Sat, 5 Jul 2014 10:23:11 -0400 Subject: 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 --- src/lib/krb5/os/trace.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'src/lib') diff --git a/src/lib/krb5/os/trace.c b/src/lib/krb5/os/trace.c index 105a2cdb7..5fbe573a1 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); -- cgit