From: Erwan Velu <erwan@redhat.com>
Date: Tue, 12 Jan 2016 10:42:22 +0000 (+0100)
Subject: osd/OSD: Simplifying 'r' usage
X-Git-Tag: v10.0.4~158^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=b3f7d02a2a5d61f50c72edd615d3f8f7898d1d9a;p=ceph.git

osd/OSD: Simplifying 'r' usage

The r variable was created unassigned and lately assigned to -1.
Even if r is always defined before its usage, sounds like initializing it to
what seems a default value (-1) from the beginning is safer for later code
inclusion.

Signed-off-by: Erwan Velu <erwan@redhat.com>
---

diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index dffd7a3712990..47a2acc18a181 100644
--- a/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@ -4102,7 +4102,7 @@ void TestOpsSocketHook::test_ops(OSDService *service, ObjectStore *store,
     pg_t rawpg;
     int64_t pool;
     OSDMapRef curmap = service->get_osdmap();
-    int r;
+    int r = -1;
 
     string poolstr;
 
@@ -4115,7 +4115,7 @@ void TestOpsSocketHook::test_ops(OSDService *service, ObjectStore *store,
       ss << "Invalid pool" << poolstr;
       return;
     }
-    r = -1;
+
     string objname, nspace;
     cmd_getval(service->cct, cmdmap, "objname", objname);
     std::size_t found = objname.find_first_of('/');