osd: use static method and simplify return

Signed-off-by: Noah Watkins <noahwatkins@gmail.com>

diff --git a/src/osd/ClassHandler.cc b/src/osd/ClassHandler.cc
index 46ba48d19e6cb1766521be8cb8b6efc8650fca4c..25d1565a139436409daa7c45690bde97b47fefa1 100644 (file)
--- a/src/osd/ClassHandler.cc
+++ b/src/osd/ClassHandler.cc
@@ -102,10 +102,7 @@ bool ClassHandler::in_class_list(const std::string& cname,
   auto it = std::find_first_of(begin, end,
       targets.begin(), targets.end());
 
-  if (it == end)
-    return false;
-
-  return true;
+  return it != end;
 }
 
 ClassHandler::ClassData *ClassHandler::_get_class(const string& cname,

diff --git a/src/osd/ClassHandler.h b/src/osd/ClassHandler.h
index f0e09422fcecb996d83415ccb69a6be6521ae030..3cca309a12c608268335a5523b955ef56ec626eb 100644 (file)
--- a/src/osd/ClassHandler.h
+++ b/src/osd/ClassHandler.h
@@ -106,7 +106,7 @@ private:
   ClassData *_get_class(const string& cname, bool check_allowed);
   int _load_class(ClassData *cls);
 
-  bool in_class_list(const std::string& cname,
+  static bool in_class_list(const std::string& cname,
       const std::string& list);
 
 public: