From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1792) id 15DC3388DD20; Sat, 27 Aug 2022 13:48:16 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 15DC3388DD20 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1661608096; bh=x+lpv3olD0YDV4iRSQ34vBm2OqimIJEW/6IStRlCcpE=; h=From:To:Subject:Date:From; b=L4vUy95q15eEQ1IlVWeW88O9/D0HJeY1L0MEuLedSgaMIBOzZ7ltWh8o40D9ZgYlq ZsJmeM5VeaL4Gziyb+vrJvJljKK99d3Qqoa++Amt8iOkCT81cKfRQQxkMuY6qeqKXl rJgHU9UH1+AQAWbX2VBL2e+z+1H3ylcsOaMHdr3I= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Samuel Thibault To: glibc-cvs@sourceware.org Subject: [glibc] mach: Fix incoherency between perror and strerror X-Act-Checkin: glibc X-Git-Author: Samuel Thibault X-Git-Refname: refs/heads/master X-Git-Oldrev: d0e357ff45a75553dee3b17ed7d303bfa544f6fe X-Git-Newrev: 03ad444e8e086391f53d87c3949e0d44adef4bc3 Message-Id: <20220827134816.15DC3388DD20@sourceware.org> Date: Sat, 27 Aug 2022 13:48:16 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=03ad444e8e086391f53d87c3949e0d44adef4bc3 commit 03ad444e8e086391f53d87c3949e0d44adef4bc3 Author: Samuel Thibault Date: Sat Aug 27 13:52:46 2022 +0200 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: --- sysdeps/mach/_strerror.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sysdeps/mach/_strerror.c b/sysdeps/mach/_strerror.c index b179c440d3..acc00612bb 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; }