From: Samuel Thibault Date: Sat, 27 Aug 2022 11:52:46 +0000 (+0200) Subject: mach: Fix incoherency between perror and strerror X-Git-Tag: glibc-2.37~397 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=03ad444e8e08;p=thirdparty%2Fglibc.git mach: Fix incoherency between perror and strerror 08d2024b4167 ("string: Simplify strerror_r") inadvertently made __strerror_r print unknown error system in decimal while the original code was printing it in hexadecimal. perror was kept printing in hexadecimal in 725eeb4af14c ("string: Use tls-internal on strerror_l"), let us keep both coherent. This also fixes a duplicate ':' Spotted by the libunistring testsuite test-perror2 --- diff --git a/sysdeps/mach/_strerror.c b/sysdeps/mach/_strerror.c index b179c440d3c..acc00612bb3 100644 --- a/sysdeps/mach/_strerror.c +++ b/sysdeps/mach/_strerror.c @@ -40,7 +40,7 @@ __strerror_r (int errnum, char *buf, size_t buflen) if (system > err_max_system || ! __mach_error_systems[system].bad_sub) { - __snprintf (buf, buflen, "%s: %d", _("Error in unknown error system: "), + __snprintf (buf, buflen, "%s%X", _("Error in unknown error system: "), errnum); return buf; }