diff options
Diffstat (limited to 'string')
| -rw-r--r-- | string/_strerror.c | 41 |
1 files changed, 2 insertions, 39 deletions
diff --git a/string/_strerror.c b/string/_strerror.c index 01226e3d4b..da3b22f5b1 100644 --- a/string/_strerror.c +++ b/string/_strerror.c @@ -15,22 +15,10 @@ License along with the GNU C Library; if not, see <https://www.gnu.org/licenses/>. */ +#include <string.h> #include <libintl.h> -#include <stdbool.h> #include <stdio.h> #include <stdlib.h> -#include <string.h> -#include <sys/param.h> -#include <_itoa.h> - -/* It is critical here that we always use the `dcgettext' function for - the message translation. Since <libintl.h> only defines the macro - `dgettext' to use `dcgettext' for optimizing programs this is not - always guaranteed. */ -#ifndef dgettext -# include <locale.h> /* We need LC_MESSAGES. */ -# define dgettext(domainname, msgid) dcgettext (domainname, msgid, LC_MESSAGES) -#endif /* Return a string describing the errno code in ERRNUM. */ char * @@ -39,32 +27,7 @@ __strerror_r (int errnum, char *buf, size_t buflen) char *err = (char *) __get_errlist (errnum); if (__glibc_unlikely (err == NULL)) { - /* Buffer we use to print the number in. For a maximum size for - `int' of 8 bytes we never need more than 20 digits. */ - char numbuf[21]; - const char *unk = _("Unknown error "); - size_t unklen = strlen (unk); - char *p, *q; - bool negative = errnum < 0; - - numbuf[20] = '\0'; - p = _itoa_word (abs (errnum), &numbuf[20], 10, 0); - - /* Now construct the result while taking care for the destination - buffer size. */ - q = __mempcpy (buf, unk, MIN (unklen, buflen)); - if (negative && unklen < buflen) - { - *q++ = '-'; - ++unklen; - } - if (unklen < buflen) - memcpy (q, p, MIN ((size_t) (&numbuf[21] - p), buflen - unklen)); - - /* Terminate the string in any case. */ - if (buflen > 0) - buf[buflen - 1] = '\0'; - + __snprintf (buf, buflen, "%s%d", _("Unknown error "), errnum); return buf; } |