diff options
author | David Howells <dhowells@redhat.com> | 2010-06-28 14:05:04 +0100 |
---|---|---|
committer | James Morris <jmorris@namei.org> | 2010-08-02 15:34:56 +1000 |
commit | 94fd8405ea62bd2d4a40f3013e8e6935b6643235 (patch) | |
tree | 14bff044866db418ec7f84944fc80998df851a99 | |
parent | 0849e3ba53c3ef603dffa9758a73e07ed186a937 (diff) | |
download | linux-94fd8405ea62bd2d4a40f3013e8e6935b6643235.tar.gz |
KEYS: Use the variable 'key' in keyctl_describe_key()
keyctl_describe_key() turns the key reference it gets into a usable key pointer and assigns that to a variable called 'key', which it then ignores in favour of recomputing the key pointer each time it needs it. Make it use the precomputed pointer instead. Without this patch, gcc 4.6 reports that the variable key is set but not used: building with gcc 4.6 I'm getting a warning message: CC security/keys/keyctl.o security/keys/keyctl.c: In function 'keyctl_describe_key': security/keys/keyctl.c:472:14: warning: variable 'key' set but not used Reported-by: Justin P. Mattock <justinmattock@gmail.com> Signed-off-by: David Howells <dhowells@redhat.com> Signed-off-by: James Morris <jmorris@namei.org>
-rw-r--r-- | security/keys/keyctl.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/security/keys/keyctl.c b/security/keys/keyctl.c index 639226afd0db..b2b0998d6abd 100644 --- a/security/keys/keyctl.c +++ b/security/keys/keyctl.c @@ -505,13 +505,11 @@ okay: ret = snprintf(tmpbuf, PAGE_SIZE - 1, "%s;%d;%d;%08x;%s", - key_ref_to_ptr(key_ref)->type->name, - key_ref_to_ptr(key_ref)->uid, - key_ref_to_ptr(key_ref)->gid, - key_ref_to_ptr(key_ref)->perm, - key_ref_to_ptr(key_ref)->description ? - key_ref_to_ptr(key_ref)->description : "" - ); + key->type->name, + key->uid, + key->gid, + key->perm, + key->description ?: ""); /* include a NUL char at the end of the data */ if (ret > PAGE_SIZE - 1) |