From 79f342b954a6f47ee3f1277a899066a654e7c330 Mon Sep 17 00:00:00 2001 From: Kurtis Rader Date: Wed, 4 May 2016 15:19:47 -0700 Subject: lint cleanup: eliminate "redundant" errors This removes some pointless parentheses but the primary focus is removing redundancies like unnecessary "else" clauses. --- src/wutil.cpp | 24 ++++++++++-------------- 1 file changed, 10 insertions(+), 14 deletions(-) (limited to 'src/wutil.cpp') diff --git a/src/wutil.cpp b/src/wutil.cpp index c8b9e3f4..4299956a 100644 --- a/src/wutil.cpp +++ b/src/wutil.cpp @@ -292,24 +292,20 @@ const char *safe_strerror(int err) { return &_sys_errs[_sys_index[err]]; } #endif // either HAVE__SYS__ERRS or HAVE_SYS_ERRLIST - else #endif // defined(HAVE__SYS__ERRS) || defined(HAVE_SYS_ERRLIST) - { - int saved_err = errno; - // Use a shared buffer for this case. - static char buff[384]; - char errnum_buff[64]; - format_long_safe(errnum_buff, err); + int saved_err = errno; + static char buff[384]; // use a shared buffer for this case + char errnum_buff[64]; + format_long_safe(errnum_buff, err); - buff[0] = '\0'; - safe_append(buff, "unknown error (errno was ", sizeof buff); - safe_append(buff, errnum_buff, sizeof buff); - safe_append(buff, ")", sizeof buff); + buff[0] = '\0'; + safe_append(buff, "unknown error (errno was ", sizeof buff); + safe_append(buff, errnum_buff, sizeof buff); + safe_append(buff, ")", sizeof buff); - errno = saved_err; - return buff; - } + errno = saved_err; + return buff; } void safe_perror(const char *message) { -- cgit v1.2.3