From: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
Date: Wed, 3 Feb 2016 11:19:48 +0000 (+0100)
Subject: client/Client.cc: reduce scope of some variables
X-Git-Tag: v10.1.0~312^2~25
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=c08435cfe560a8dda6662c9a4ab56e55d65b19f7;p=ceph.git

client/Client.cc: reduce scope of some variables

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
---

diff --git a/src/client/Client.cc b/src/client/Client.cc
index c506c4550b6..1abeb2a5aba 100644
--- a/src/client/Client.cc
+++ b/src/client/Client.cc
@@ -4816,6 +4816,7 @@ void Client::handle_cap_grant(MetaSession *session, Inode *in, Cap *cap, MClient
 
 int Client::_getgrouplist(gid_t** sgids, int uid, int gid)
 {
+  // cppcheck-suppress variableScope
   int sgid_count;
   gid_t *sgid_buf;
 
@@ -4875,9 +4876,8 @@ int Client::inode_permission(Inode *in, uid_t uid, UserGroups& groups, unsigned
   if (uid == 0)
     return 0;
 
-  int ret;
   if (uid != in->uid && (in->mode & S_IRWXG)) {
-    ret = _posix_acl_permission(in, uid, groups, want);
+    int ret = _posix_acl_permission(in, uid, groups, want);
     if (ret != -EAGAIN)
       return ret;
   }