Merge remote branch 'gh/wip-warnings'

6 files changed, 26 insertions, 26 deletions

diff --git a/src/common/admin_socket_client.cc b/src/common/admin_socket_client.cc
index f9798737bb6..782e808ad86 100644
--- a/src/common/admin_socket_client.cc
+++ b/src/common/admin_socket_client.cc
@@ -128,14 +128,14 @@ AdminSocketClient(const std::string &path)
 
 std::string AdminSocketClient::do_request(std::string request, std::string *result)
 {
-  int socket_fd, res;
+  int socket_fd = 0, res;
   std::vector<uint8_t> vec(65536, 0);
   uint8_t *buffer = &vec[0];
   uint32_t message_size_raw, message_size;
 
   std::string err = asok_connect(m_path, &socket_fd);
   if (!err.empty()) {
-    goto done;
+    goto out;
   }
   err = asok_request(socket_fd, request);
   if (!err.empty()) {
@@ -164,5 +164,6 @@ std::string AdminSocketClient::do_request(std::string request, std::string *resu
   result->assign((const char*)buffer);
 done:
   close(socket_fd);
+ out:
   return err;
 }
diff --git a/src/osd/PG.cc b/src/osd/PG.cc
index e1dd7539960..ae3bf1405b0 100644
--- a/src/osd/PG.cc
+++ b/src/osd/PG.cc
@@ -1328,7 +1328,6 @@ void PG::activate(ObjectStore::Transaction& t, list<Context*>& tfin,
 
       // update local version of peer's missing list!
       if (m && pi.last_backfill != hobject_t()) {
-        eversion_t plu = pi.last_update;
         for (list<Log::Entry>::iterator p = m->log.log.begin();
              p != m->log.log.end();
              p++)
diff --git a/src/test/encoding.cc b/src/test/encoding.cc
index 225e3312fd6..2662c240eaa 100644
--- a/src/test/encoding.cc
+++ b/src/test/encoding.cc
@@ -64,7 +64,7 @@ template <typename T>
 class ConstructorCounter
 {
 public:
-  ConstructorCounter()
+  ConstructorCounter() : data(0)
   {
     default_ctor++;
   }
diff --git a/src/test/gather.cc b/src/test/gather.cc
index 61797931eca..92bec7650c6 100644
--- a/src/test/gather.cc
+++ b/src/test/gather.cc
@@ -26,7 +26,7 @@ public:
 TEST(ContextGather, Constructor) {
   C_GatherBuilder gather(g_ceph_context);
   EXPECT_FALSE(gather.has_subs());
-  EXPECT_EQ(NULL, gather.get());
+  EXPECT_TRUE(gather.get() == NULL);
 }
 
 TEST(ContextGather, OneSub) {
diff --git a/src/test/rados-api/list.cc b/src/test/rados-api/list.cc
index 0eb6afde32f..d94aebe2afc 100644
--- a/src/test/rados-api/list.cc
+++ b/src/test/rados-api/list.cc
@@ -40,7 +40,7 @@ TEST(LibRadosList, ListObjectsPP) {
   bl1.append(buf, sizeof(buf));
   ASSERT_EQ((int)sizeof(buf), ioctx.write("foo", bl1, sizeof(buf), 0));
   ObjectIterator iter(ioctx.objects_begin());
-  ASSERT_EQ(false, (iter == ioctx.objects_end()));
+  ASSERT_EQ((iter == ioctx.objects_end()), false);
   ASSERT_EQ((*iter).first, "foo");
   ++iter;
   ASSERT_EQ(true, (iter == ioctx.objects_end()));
diff --git a/src/test/test_ipaddr.cc b/src/test/test_ipaddr.cc
index 068955443bb..f59f0af1ff9 100644
--- a/src/test/test_ipaddr.cc
+++ b/src/test/test_ipaddr.cc
@@ -214,7 +214,7 @@ TEST(CommonIPAddr, ParseNetwork_Empty)
   bool ok;
 
   ok = parse_network("", &network, &prefix_len);
-  ASSERT_EQ(false, ok);
+  ASSERT_EQ(ok, false);
 }
 
 TEST(CommonIPAddr, ParseNetwork_Bad_Junk)
@@ -224,7 +224,7 @@ TEST(CommonIPAddr, ParseNetwork_Bad_Junk)
   bool ok;
 
   ok = parse_network("foo", &network, &prefix_len);
-  ASSERT_EQ(false, ok);
+  ASSERT_EQ(ok, false);
 }
 
 TEST(CommonIPAddr, ParseNetwork_Bad_SlashNum)
@@ -234,7 +234,7 @@ TEST(CommonIPAddr, ParseNetwork_Bad_SlashNum)
   bool ok;
 
   ok = parse_network("/24", (struct sockaddr*)&network, &prefix_len);
-  ASSERT_EQ(false, ok);
+  ASSERT_EQ(ok, false);
 }
 
 TEST(CommonIPAddr, ParseNetwork_Bad_Slash)
@@ -244,7 +244,7 @@ TEST(CommonIPAddr, ParseNetwork_Bad_Slash)
   bool ok;
 
   ok = parse_network("/", (struct sockaddr*)&network, &prefix_len);
-  ASSERT_EQ(false, ok);
+  ASSERT_EQ(ok, false);
 }
 
 TEST(CommonIPAddr, ParseNetwork_Bad_IPv4)
@@ -254,7 +254,7 @@ TEST(CommonIPAddr, ParseNetwork_Bad_IPv4)
   bool ok;
 
   ok = parse_network("123.123.123.123", &network, &prefix_len);
-  ASSERT_EQ(false, ok);
+  ASSERT_EQ(ok, false);
 }
 
 TEST(CommonIPAddr, ParseNetwork_Bad_IPv4Slash)
@@ -264,7 +264,7 @@ TEST(CommonIPAddr, ParseNetwork_Bad_IPv4Slash)
   bool ok;
 
   ok = parse_network("123.123.123.123/", &network, &prefix_len);
-  ASSERT_EQ(false, ok);
+  ASSERT_EQ(ok, false);
 }
 
 TEST(CommonIPAddr, ParseNetwork_Bad_IPv4SlashNegative)
@@ -274,7 +274,7 @@ TEST(CommonIPAddr, ParseNetwork_Bad_IPv4SlashNegative)
   bool ok;
 
   ok = parse_network("123.123.123.123/-3", &network, &prefix_len);
-  ASSERT_EQ(false, ok);
+  ASSERT_EQ(ok, false);
 }
 
 TEST(CommonIPAddr, ParseNetwork_Bad_IPv4SlashJunk)
@@ -284,7 +284,7 @@ TEST(CommonIPAddr, ParseNetwork_Bad_IPv4SlashJunk)
   bool ok;
 
   ok = parse_network("123.123.123.123/foo", &network, &prefix_len);
-  ASSERT_EQ(false, ok);
+  ASSERT_EQ(ok, false);
 }
 
 TEST(CommonIPAddr, ParseNetwork_Bad_IPv6)
@@ -294,7 +294,7 @@ TEST(CommonIPAddr, ParseNetwork_Bad_IPv6)
   bool ok;
 
   ok = parse_network("2001:1234:5678:90ab::dead:beef", &network, &prefix_len);
-  ASSERT_EQ(false, ok);
+  ASSERT_EQ(ok, false);
 }
 
 TEST(CommonIPAddr, ParseNetwork_Bad_IPv6Slash)
@@ -304,7 +304,7 @@ TEST(CommonIPAddr, ParseNetwork_Bad_IPv6Slash)
   bool ok;
 
   ok = parse_network("2001:1234:5678:90ab::dead:beef/", &network, &prefix_len);
-  ASSERT_EQ(false, ok);
+  ASSERT_EQ(ok, false);
 }
 
 TEST(CommonIPAddr, ParseNetwork_Bad_IPv6SlashNegative)
@@ -314,7 +314,7 @@ TEST(CommonIPAddr, ParseNetwork_Bad_IPv6SlashNegative)
   bool ok;
 
   ok = parse_network("2001:1234:5678:90ab::dead:beef/-3", &network, &prefix_len);
-  ASSERT_EQ(false, ok);
+  ASSERT_EQ(ok, false);
 }
 
 TEST(CommonIPAddr, ParseNetwork_Bad_IPv6SlashJunk)
@@ -324,7 +324,7 @@ TEST(CommonIPAddr, ParseNetwork_Bad_IPv6SlashJunk)
   bool ok;
 
   ok = parse_network("2001:1234:5678:90ab::dead:beef/foo", &network, &prefix_len);
-  ASSERT_EQ(false, ok);
+  ASSERT_EQ(ok, false);
 }
 
 TEST(CommonIPAddr, ParseNetwork_IPv4_0)
@@ -334,7 +334,7 @@ TEST(CommonIPAddr, ParseNetwork_IPv4_0)
   bool ok;
 
   ok = parse_network("123.123.123.123/0", (struct sockaddr*)&network, &prefix_len);
-  ASSERT_EQ(true, ok);
+  ASSERT_EQ(ok, true);
   ASSERT_EQ(0U, prefix_len);
   ASSERT_EQ(AF_INET, network.sin_family);
   ASSERT_EQ(0, network.sin_port);
@@ -350,7 +350,7 @@ TEST(CommonIPAddr, ParseNetwork_IPv4_13)
   bool ok;
 
   ok = parse_network("123.123.123.123/13", (struct sockaddr*)&network, &prefix_len);
-  ASSERT_EQ(true, ok);
+  ASSERT_EQ(ok, true);
   ASSERT_EQ(13U, prefix_len);
   ASSERT_EQ(AF_INET, network.sin_family);
   ASSERT_EQ(0, network.sin_port);
@@ -366,7 +366,7 @@ TEST(CommonIPAddr, ParseNetwork_IPv4_32)
   bool ok;
 
   ok = parse_network("123.123.123.123/32", (struct sockaddr*)&network, &prefix_len);
-  ASSERT_EQ(true, ok);
+  ASSERT_EQ(ok, true);
   ASSERT_EQ(32U, prefix_len);
   ASSERT_EQ(AF_INET, network.sin_family);
   ASSERT_EQ(0, network.sin_port);
@@ -382,7 +382,7 @@ TEST(CommonIPAddr, ParseNetwork_IPv4_42)
   bool ok;
 
   ok = parse_network("123.123.123.123/42", (struct sockaddr*)&network, &prefix_len);
-  ASSERT_EQ(true, ok);
+  ASSERT_EQ(ok, true);
   ASSERT_EQ(42U, prefix_len);
   ASSERT_EQ(AF_INET, network.sin_family);
   ASSERT_EQ(0, network.sin_port);
@@ -398,7 +398,7 @@ TEST(CommonIPAddr, ParseNetwork_IPv6_0)
   bool ok;
 
   ok = parse_network("2001:1234:5678:90ab::dead:beef/0", (struct sockaddr*)&network, &prefix_len);
-  ASSERT_EQ(true, ok);
+  ASSERT_EQ(ok, true);
   ASSERT_EQ(0U, prefix_len);
   ASSERT_EQ(AF_INET6, network.sin6_family);
   ASSERT_EQ(0, network.sin6_port);
@@ -414,7 +414,7 @@ TEST(CommonIPAddr, ParseNetwork_IPv6_67)
   bool ok;
 
   ok = parse_network("2001:1234:5678:90ab::dead:beef/67", (struct sockaddr*)&network, &prefix_len);
-  ASSERT_EQ(true, ok);
+  ASSERT_EQ(ok, true);
   ASSERT_EQ(67U, prefix_len);
   ASSERT_EQ(AF_INET6, network.sin6_family);
   ASSERT_EQ(0, network.sin6_port);
@@ -430,7 +430,7 @@ TEST(CommonIPAddr, ParseNetwork_IPv6_128)
   bool ok;
 
   ok = parse_network("2001:1234:5678:90ab::dead:beef/128", (struct sockaddr*)&network, &prefix_len);
-  ASSERT_EQ(true, ok);
+  ASSERT_EQ(ok, true);
   ASSERT_EQ(128U, prefix_len);
   ASSERT_EQ(AF_INET6, network.sin6_family);
   ASSERT_EQ(0, network.sin6_port);
@@ -446,7 +446,7 @@ TEST(CommonIPAddr, ParseNetwork_IPv6_9000)
   bool ok;
 
   ok = parse_network("2001:1234:5678:90ab::dead:beef/9000", (struct sockaddr*)&network, &prefix_len);
-  ASSERT_EQ(true, ok);
+  ASSERT_EQ(ok, true);
   ASSERT_EQ(9000U, prefix_len);
   ASSERT_EQ(AF_INET6, network.sin6_family);
   ASSERT_EQ(0, network.sin6_port);