From: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
Date: Tue, 7 May 2013 15:11:32 +0000 (+0200)
Subject: common/admin_socket.cc: remove scope of ret variable in do_accept()
X-Git-Tag: v0.63~46^2~8
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=b66b8ddff92244de5704758a2d6fcfe397638de1;p=ceph.git

common/admin_socket.cc: remove scope of ret variable in do_accept()

Reduce scope of ret variable and remove usage in one case.

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

diff --git a/src/common/admin_socket.cc b/src/common/admin_socket.cc
index dc5519c78824..fbcfabb8dd01 100644
--- a/src/common/admin_socket.cc
+++ b/src/common/admin_socket.cc
@@ -251,7 +251,6 @@ void* AdminSocket::entry()
 
 bool AdminSocket::do_accept()
 {
-  int ret;
   struct sockaddr_un address;
   socklen_t address_length = sizeof(address);
   ldout(m_cct, 30) << "AdminSocket: calling accept" << dendl;
@@ -269,7 +268,7 @@ bool AdminSocket::do_accept()
   int pos = 0;
   string c;
   while (1) {
-    ret = safe_read(connection_fd, &cmd[pos], 1);
+    int ret = safe_read(connection_fd, &cmd[pos], 1);
     if (ret <= 0) {
       lderr(m_cct) << "AdminSocket: error reading request code: "
 		   << cpp_strerror(ret) << dendl;
@@ -356,8 +355,7 @@ bool AdminSocket::do_accept()
       lderr(m_cct) << "AdminSocket: error writing response length "
 		   << cpp_strerror(ret) << dendl;
     } else {
-      ret = out.write_fd(connection_fd);
-      if (ret >= 0)
+      if (out.write_fd(connection_fd) >= 0)
 	rval = true;
     }
   }