diff options
| author | Pawel Jakub Dawidek <pjd@FreeBSD.org> | 2013-11-14 22:59:20 +0000 |
|---|---|---|
| committer | Pawel Jakub Dawidek <pjd@FreeBSD.org> | 2013-11-14 22:59:20 +0000 |
| commit | d673cd358cf29340c34317d013f046ffa9aa01cb (patch) | |
| tree | 61aecf5fc22e330eb22c7b456a53875e7bb3bf6d /sys/kern | |
| parent | 98b74f0d1d47ff12384c7554be341eb297d2dfaa (diff) | |
| download | src-d673cd358cf29340c34317d013f046ffa9aa01cb.tar.gz src-d673cd358cf29340c34317d013f046ffa9aa01cb.zip | |
Change cap_rights_merge(3) and cap_rights_remove(3) to return pointer
to the destination cap_rights_t structure.
This already matches manual page.
MFC after: 3 days
Notes
Notes:
svn path=/head/; revision=258149
Diffstat (limited to 'sys/kern')
| -rw-r--r-- | sys/kern/subr_capability.c | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/sys/kern/subr_capability.c b/sys/kern/subr_capability.c index 1098448d4e55..ce41f4a46b55 100644 --- a/sys/kern/subr_capability.c +++ b/sys/kern/subr_capability.c @@ -168,7 +168,7 @@ __cap_rights_init(int version, cap_rights_t *rights, ...) return (rights); } -void +cap_rights_t * __cap_rights_set(cap_rights_t *rights, ...) { va_list ap; @@ -178,9 +178,11 @@ __cap_rights_set(cap_rights_t *rights, ...) va_start(ap, rights); cap_rights_vset(rights, ap); va_end(ap); + + return (rights); } -void +cap_rights_t * __cap_rights_clear(cap_rights_t *rights, ...) { va_list ap; @@ -190,6 +192,8 @@ __cap_rights_clear(cap_rights_t *rights, ...) va_start(ap, rights); cap_rights_vclear(rights, ap); va_end(ap); + + return (rights); } bool @@ -235,7 +239,7 @@ cap_rights_is_valid(const cap_rights_t *rights) return (true); } -void +cap_rights_t * cap_rights_merge(cap_rights_t *dst, const cap_rights_t *src) { unsigned int i, n; @@ -254,9 +258,11 @@ cap_rights_merge(cap_rights_t *dst, const cap_rights_t *src) assert(cap_rights_is_valid(src)); assert(cap_rights_is_valid(dst)); + + return (dst); } -void +cap_rights_t * cap_rights_remove(cap_rights_t *dst, const cap_rights_t *src) { unsigned int i, n; @@ -277,6 +283,8 @@ cap_rights_remove(cap_rights_t *dst, const cap_rights_t *src) assert(cap_rights_is_valid(src)); assert(cap_rights_is_valid(dst)); + + return (dst); } bool |