cleanup: replace some length() with !empty()

Signed-off-by: Xinze Chi <xmdxcxz@gmail.com>

diff --git a/src/mds/MDS.cc b/src/mds/MDS.cc
index a22c585f8f58bfc4dbf8dd6c0c7d55b945b71dff..1f0bfff4e1bb4e226b8d181f507ae7283f11d138 100644 (file)
--- a/src/mds/MDS.cc
+++ b/src/mds/MDS.cc
@@ -91,13 +91,13 @@ MDS::MDS(const std::string &n, Messenger *m, MonClient *mc) :
   hb(NULL),
   beacon(m->cct, mc, n),
   authorize_handler_cluster_registry(new AuthAuthorizeHandlerRegistry(m->cct,
-                                                                     m->cct->_conf->auth_supported.length() ?
-                                                                     m->cct->_conf->auth_supported :
-                                                                     m->cct->_conf->auth_cluster_required)),
+                                                                     m->cct->_conf->auth_supported.empty() ?
+                                                                     m->cct->_conf->auth_cluster_required :
+                                                                     m->cct->_conf->auth_supported)),
   authorize_handler_service_registry(new AuthAuthorizeHandlerRegistry(m->cct,
-                                                                     m->cct->_conf->auth_supported.length() ?
-                                                                     m->cct->_conf->auth_supported :
-                                                                     m->cct->_conf->auth_service_required)),
+                                                                     m->cct->_conf->auth_supported.empty() ?
+                                                                     m->cct->_conf->auth_service_required :
+                                                                     m->cct->_conf->auth_supported)),
   name(n),
   whoami(MDS_RANK_NONE), incarnation(0),
   standby_for_rank(MDSMap::MDS_NO_STANDBY_PREF),

diff --git a/src/mon/MonClient.cc b/src/mon/MonClient.cc
index 8f42fbc150077c5b31448ce60551babdca92b313..04de7e29b573a49ddf4e5c9a700e4200231c9e51 100644 (file)
--- a/src/mon/MonClient.cc
+++ b/src/mon/MonClient.cc
@@ -354,7 +354,7 @@ int MonClient::init()
   Mutex::Locker l(monc_lock);
 
   string method;
-    if (cct->_conf->auth_supported.length() != 0)
+    if (!cct->_conf->auth_supported.empty())
       method = cct->_conf->auth_supported;
     else if (entity_name.get_type() == CEPH_ENTITY_TYPE_OSD ||
              entity_name.get_type() == CEPH_ENTITY_TYPE_MDS ||
@@ -372,7 +372,7 @@ int MonClient::init()
     r = keyring->from_ceph_context(cct);
     if (r == -ENOENT) {
       auth_supported->remove_supported_auth(CEPH_AUTH_CEPHX);
-      if (auth_supported->get_supported_set().size() > 0) {
+      if (!auth_supported->get_supported_set().empty()) {
        r = 0;
        no_keyring_disabled_cephx = true;
       } else {

diff --git a/src/mon/Monitor.cc b/src/mon/Monitor.cc
index 5b074aa0b326ed4c6fdb7b13023c50819fe8d1cd..6344b32b56c4457c66eedc2b57c7d8b61de6067d 100644 (file)
--- a/src/mon/Monitor.cc
+++ b/src/mon/Monitor.cc
@@ -145,11 +145,11 @@ Monitor::Monitor(CephContext* cct_, string nm, MonitorDBStore *s,
   log_client(cct_, messenger, monmap, LogClient::FLAG_MON),
   key_server(cct, &keyring),
   auth_cluster_required(cct,
-                       cct->_conf->auth_supported.length() ?
-                       cct->_conf->auth_supported : cct->_conf->auth_cluster_required),
+                       cct->_conf->auth_supported.empty() ?
+                       cct->_conf->auth_cluster_required : cct->_conf->auth_supported),
   auth_service_required(cct,
-                       cct->_conf->auth_supported.length() ?
-                       cct->_conf->auth_supported : cct->_conf->auth_service_required),
+                       cct->_conf->auth_supported.empty() ?
+                       cct->_conf->auth_service_required : cct->_conf->auth_supported ),
   leader_supported_mon_commands(NULL),
   leader_supported_mon_commands_size(0),
   store(s),
@@ -2504,10 +2504,10 @@ void Monitor::set_leader_supported_commands(const MonCommand *cmds, int size)
 
 bool Monitor::is_keyring_required()
 {
-  string auth_cluster_required = g_conf->auth_supported.length() ?
-    g_conf->auth_supported : g_conf->auth_cluster_required;
-  string auth_service_required = g_conf->auth_supported.length() ?
-    g_conf->auth_supported : g_conf->auth_service_required;
+  string auth_cluster_required = g_conf->auth_supported.empty() ?
+    g_conf->auth_cluster_required : g_conf->auth_supported;
+  string auth_service_required = g_conf->auth_supported.empty() ?
+    g_conf->auth_service_required : g_conf->auth_supported;
 
   return auth_service_required == "cephx" ||
     auth_cluster_required == "cephx";

diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index 4d6a01da7d242902d23c77d7697428dfee5b7e66..64f886cbd147131c73555210a3b5c60c87c9cb56 100644 (file)
--- a/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@ -1501,13 +1501,13 @@ OSD::OSD(CephContext *cct_, ObjectStore *store_,
   osd_lock("OSD::osd_lock"),
   tick_timer(cct, osd_lock),
   authorize_handler_cluster_registry(new AuthAuthorizeHandlerRegistry(cct,
-                                                                     cct->_conf->auth_supported.length() ?
-                                                                     cct->_conf->auth_supported :
-                                                                     cct->_conf->auth_cluster_required)),
+                                                                     cct->_conf->auth_supported.empty() ?
+                                                                     cct->_conf->auth_cluster_required :
+                                                                     cct->_conf->auth_supported)),
   authorize_handler_service_registry(new AuthAuthorizeHandlerRegistry(cct,
-                                                                     cct->_conf->auth_supported.length() ?
-                                                                     cct->_conf->auth_supported :
-                                                                     cct->_conf->auth_service_required)),
+                                                                     cct->_conf->auth_supported.empty() ?
+                                                                     cct->_conf->auth_service_required :
+                                                                     cct->_conf->auth_supported)),
   cluster_messenger(internal_messenger),
   client_messenger(external_messenger),
   objecter_messenger(osdc_messenger),