From 9ec31e57278ffc4e680ef03e75ce5b6b02e5edcf Mon Sep 17 00:00:00 2001 From: Sergey Bugaev Date: Sat, 20 May 2023 14:55:29 +0300 Subject: hurd: Use __hurd_fail () instead of assigning errno The __hurd_fail () inline function is the dedicated, idiomatic way of reporting errors in the Hurd part of glibc. Not only is it more concise than '{ errno = err; return -1; }', it is since commit 6639cc10029e24e06b34e169712b21c31b8cf213 "hurd: Mark error functions as __COLD" marked with the cold attribute, telling the compiler that this codepath is unlikely to be executed. In one case, use __hurd_dfail () over the plain __hurd_fail (). Signed-off-by: Sergey Bugaev Message-Id: <20230520115531.3911877-1-bugaevc@gmail.com> --- sysdeps/mach/hurd/getgid.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) (limited to 'sysdeps/mach/hurd/getgid.c') diff --git a/sysdeps/mach/hurd/getgid.c b/sysdeps/mach/hurd/getgid.c index f49e592f79..62183074ea 100644 --- a/sysdeps/mach/hurd/getgid.c +++ b/sysdeps/mach/hurd/getgid.c @@ -32,18 +32,12 @@ retry: __mutex_lock (&_hurd_id.lock); if (err = _hurd_check_ids ()) - { - errno = err; - gid = -1; - } + gid = __hurd_fail (err); else if (_hurd_id.aux.ngids >= 1) gid = _hurd_id.aux.gids[0]; else - { - /* We do not even have a real gid. */ - errno = EGRATUITOUS; - gid = -1; - } + /* We do not even have a real gid. */ + gid = __hurd_fail (EGRATUITOUS); __mutex_unlock (&_hurd_id.lock); HURD_CRITICAL_END; -- cgit 1.4.1