]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
osd/OSD: Simplifying 'r' usage 7201/head
authorErwan Velu <erwan@redhat.com>
Tue, 12 Jan 2016 10:42:22 +0000 (11:42 +0100)
committerErwan Velu <erwan@redhat.com>
Tue, 19 Jan 2016 10:05:23 +0000 (11:05 +0100)
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>
src/osd/OSD.cc

index dffd7a3712990198f4ce807128f58f6869c2102f..47a2acc18a1816fc843dd2195ac0e74bdd304054 100644 (file)
@@ -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('/');