test, ceph-osdomap-tool: kill clang warnings

src/test/msgr/test_async_driver.cc

@@ -154,6 +154,7 @@ void* echoclient(void *arg)
   int connect_sd = ::socket(AF_INET, SOCK_STREAM, 0);
   if (connect_sd >= 0) {
     r = connect(connect_sd, (struct sockaddr*)&sa, sizeof(sa));
+    assert(r == 0);
     int t = 0;
 
     do {
@@ -226,21 +227,22 @@ TEST_P(EventDriverTest, NetworkSocketTest) {
     tv.tv_sec = 5;
     tv.tv_usec = 0;
     r = driver->event_wait(fired_events, &tv);
-    ASSERT_EQ(r, 1);
-    ASSERT_EQ(fired_events[0].mask, EVENT_READABLE);
+    ASSERT_EQ(1, r);
+    ASSERT_EQ(EVENT_READABLE, fired_events[0].mask);
 
     fired_events.clear();
     char data[100];
     r = ::read(client_sd, data, sizeof(data));
     if (r == 0)
       break;
-    ASSERT_TRUE(r > 0);
+    ASSERT_GT(r, 0);
     r = driver->add_event(client_sd, EVENT_READABLE, EVENT_WRITABLE);
+    ASSERT_EQ(0, r);
     r = driver->event_wait(fired_events, &tv);
-    ASSERT_EQ(r, 1);
+    ASSERT_EQ(1, r);
     ASSERT_EQ(fired_events[0].mask, EVENT_WRITABLE);
     r = write(client_sd, data, strlen(data));
-    ASSERT_EQ(r, (int)strlen(data));
+    ASSERT_EQ((int)strlen(data), r);
     driver->del_event(client_sd, EVENT_READABLE|EVENT_WRITABLE,
                       EVENT_WRITABLE);
   } while (1);

src/tools/ceph_osdomap_tool.cc

@@ -107,31 +107,31 @@ int main(int argc, char **argv) {
   if (r < 0) {
     std::cerr << "Store open got: " << cpp_strerror(r) << std::endl;
     std::cerr << "Output: " << out.str() << std::endl;
-    goto done;
+    return r;
   }
   // We don't call omap.init() here because it will repair
   // the DBObjectMap which we might want to examine for diagnostic
   // reasons.  Instead use --command repair.
-  r = 0;
-
 
   if (cmd == "dump-raw-keys") {
     KeyValueDB::WholeSpaceIterator i = store->get_iterator();
     for (i->seek_to_first(); i->valid(); i->next()) {
       std::cout << i->raw_key() << std::endl;
     }
+    return 0;
   } else if (cmd == "dump-raw-key-vals") {
     KeyValueDB::WholeSpaceIterator i = store->get_iterator();
     for (i->seek_to_first(); i->valid(); i->next()) {
       std::cout << i->raw_key() << std::endl;
       i->value().hexdump(std::cout);
     }
+    return 0;
   } else if (cmd == "dump-objects") {
     vector<ghobject_t> objects;
     r = omap.list_objects(&objects);
     if (r < 0) {
       std::cerr << "list_objects got: " << cpp_strerror(r) << std::endl;
-      goto done;
+      return r;
     }
     for (vector<ghobject_t>::iterator i = objects.begin();
 	 i != objects.end();
@@ -140,13 +140,13 @@ int main(int argc, char **argv) {
         continue;
       std::cout << *i << std::endl;
     }
-    r = 0;
+    return 0;
   } else if (cmd == "dump-objects-with-keys") {
     vector<ghobject_t> objects;
     r = omap.list_objects(&objects);
     if (r < 0) {
       std::cerr << "list_objects got: " << cpp_strerror(r) << std::endl;
-      goto done;
+      return r;
     }
     for (vector<ghobject_t>::iterator i = objects.begin();
 	 i != objects.end();
@@ -160,6 +160,7 @@ int main(int argc, char **argv) {
 	j->value().hexdump(std::cout);
       }
     }
+    return 0;
   } else if (cmd == "check" || cmd == "repair") {
     ostringstream ss;
     bool repair = (cmd == "repair");
@@ -168,28 +169,23 @@ int main(int argc, char **argv) {
       std::cerr << ss.str() << std::endl;
       if (r > 0) {
         std::cerr << "check got " << r << " error(s)" << std::endl;
-        r = 1;
-        goto done;
+        return 1;
       }
     }
     std::cout << (repair ? "repair" : "check") << " succeeded" << std::endl;
+    return 0;
   } else if (cmd == "dump-headers") {
     vector<DBObjectMap::_Header> headers;
     r = omap.list_object_headers(&headers);
     if (r < 0) {
       std::cerr << "list_object_headers got: " << cpp_strerror(r) << std::endl;
-      r = 1;
-      goto done;
+      return 1;
     }
     for (auto i : headers)
       std::cout << i << std::endl;
+    return 0;
   } else {
     std::cerr << "Did not recognize command " << cmd << std::endl;
-    r = 1;
-    goto done;
+    return 1;
   }
-  r = 0;
-
-  done:
-  return r;
 }