qiurui
/
glibc
mirror of git://sourceware.org/git/glibc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

hurd: fix warning 

* sysdeps/mach/hurd/getresgid.c (__getresgid): Set result from
	critical section to make code simpler and avoid warning.
	* sysdeps/mach/hurd/getresuid.c (__getresuid): Set result from
	critical section to make code simpler and avoid warning.
This commit is contained in:
Samuel Thibault 2018-01-27 23:49:18 +01:00
parent 41cdb1eb5a
commit 660b7bff81
3 changed files with 16 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -33,6 +33,10 @@
to global scope. to global scope.
* sysdeps/mach/pagecopy.h (PAGE_THRESHOLD): Rename to * sysdeps/mach/pagecopy.h (PAGE_THRESHOLD): Rename to
PAGE_COPY_THRESHOLD and set to benchmarked 16384. PAGE_COPY_THRESHOLD and set to benchmarked 16384.
* sysdeps/mach/hurd/getresgid.c (__getresgid): Set result from
critical section to make code simpler and avoid warning.
* sysdeps/mach/hurd/getresuid.c (__getresuid): Set result from
critical section to make code simpler and avoid warning.
2018-01-27 James Clarke <jrtc27@jrtc27.com> 2018-01-27 James Clarke <jrtc27@jrtc27.com>

15
sysdeps/mach/hurd/getresgid.c
View File

@ -27,7 +27,6 @@ int
__getresgid (gid_t *rgid, gid_t *egid, gid_t *sgid) __getresgid (gid_t *rgid, gid_t *egid, gid_t *sgid)
{ {
error_t err; error_t err;
gid_t real, eff, saved;
HURD_CRITICAL_BEGIN; HURD_CRITICAL_BEGIN;
__mutex_lock (&_hurd_id.lock); __mutex_lock (&_hurd_id.lock);
@ -40,22 +39,18 @@ __getresgid (gid_t *rgid, gid_t *egid, gid_t *sgid)
err = EGRATUITOUS; err = EGRATUITOUS;
else else
{ {
real = _hurd_id.aux.gids[0]; gid_t real = _hurd_id.aux.gids[0];
eff = _hurd_id.gen.ngids < 1 ? real : _hurd_id.gen.gids[0];
saved = _hurd_id.aux.ngids < 2 ? real : _hurd_id.aux.gids[1]; *rgid = real;
*egid = _hurd_id.gen.ngids < 1 ? real : _hurd_id.gen.gids[0];
*sgid = _hurd_id.aux.ngids < 2 ? real : _hurd_id.aux.gids[1];
} }
} }
__mutex_unlock (&_hurd_id.lock); __mutex_unlock (&_hurd_id.lock);
HURD_CRITICAL_END; HURD_CRITICAL_END;
if (err)
return __hurd_fail (err); return __hurd_fail (err);
*rgid = real;
*egid = eff;
*sgid = saved;
return 0;
} }
libc_hidden_def (__getresgid) libc_hidden_def (__getresgid)
weak_alias (__getresgid, getresgid) weak_alias (__getresgid, getresgid)

15
sysdeps/mach/hurd/getresuid.c
View File

@ -27,7 +27,6 @@ int
__getresuid (uid_t *ruid, uid_t *euid, uid_t *suid) __getresuid (uid_t *ruid, uid_t *euid, uid_t *suid)
{ {
error_t err; error_t err;
uid_t real, eff, saved;
HURD_CRITICAL_BEGIN; HURD_CRITICAL_BEGIN;
__mutex_lock (&_hurd_id.lock); __mutex_lock (&_hurd_id.lock);
@ -40,22 +39,18 @@ __getresuid (uid_t *ruid, uid_t *euid, uid_t *suid)
err = EGRATUITOUS; err = EGRATUITOUS;
else else
{ {
real = _hurd_id.aux.uids[0]; uid_t real = _hurd_id.aux.uids[0];
eff = _hurd_id.gen.nuids < 1 ? real : _hurd_id.gen.uids[0];
saved = _hurd_id.aux.nuids < 2 ? real : _hurd_id.aux.uids[1]; *ruid = real;
*euid = _hurd_id.gen.nuids < 1 ? real : _hurd_id.gen.uids[0];
*suid = _hurd_id.aux.nuids < 2 ? real : _hurd_id.aux.uids[1];
} }
} }
__mutex_unlock (&_hurd_id.lock); __mutex_unlock (&_hurd_id.lock);
HURD_CRITICAL_END; HURD_CRITICAL_END;
if (err)
return __hurd_fail (err); return __hurd_fail (err);
*ruid = real;
*euid = eff;
*suid = saved;
return 0;
} }
libc_hidden_def (__getresuid) libc_hidden_def (__getresuid)
weak_alias (__getresuid, getresuid) weak_alias (__getresuid, getresuid)