X-Git-Url: https://git.octo.it/?a=blobdiff_plain;ds=sidebyside;f=src%2Futils%2Fcommon%2Fcommon.c;fp=src%2Futils%2Fcommon%2Fcommon.c;h=6ee4e081fb3f765b652406bd9c4f7fdb8d5ed045;hb=27ca3ca92a757b5c9bb3baa5a29ef352ec70b1c9;hp=0d2aaae6e67cc47e8f0ee05d53d9c06ef80c172b;hpb=626d3ab4309cdb069289354c45ca9e2ba9bc9a2f;p=collectd.git diff --git a/src/utils/common/common.c b/src/utils/common/common.c index 0d2aaae6..6ee4e081 100644 --- a/src/utils/common/common.c +++ b/src/utils/common/common.c @@ -181,7 +181,7 @@ char *sstrerror(int errnum, char *buf, size_t buflen) { pthread_mutex_unlock(&strerror_r_lock); } - /* #endif !HAVE_STRERROR_R */ +/* #endif !HAVE_STRERROR_R */ #elif STRERROR_R_CHAR_P { @@ -191,19 +191,17 @@ char *sstrerror(int errnum, char *buf, size_t buflen) { if ((temp != NULL) && (temp != buf) && (temp[0] != '\0')) sstrncpy(buf, temp, buflen); else - sstrncpy(buf, - "strerror_r did not return " - "an error message", + sstrncpy(buf, "strerror_r did not return " + "an error message", buflen); } } - /* #endif STRERROR_R_CHAR_P */ +/* #endif STRERROR_R_CHAR_P */ #else if (strerror_r(errnum, buf, buflen) != 0) { - snprintf(buf, buflen, - "Error #%i; " - "Additionally, strerror_r failed.", + snprintf(buf, buflen, "Error #%i; " + "Additionally, strerror_r failed.", errnum); } #endif /* STRERROR_R_CHAR_P */