Fix some smaller issues

README.md

@@ -52,13 +52,13 @@ Ceph contains git submodules that need to be checked out with
 
 The build requires that you have the following software/packages installed:
 
-    jansson version >= 2.9 
-    librados2-devel (rados header) version >= 10.2.5 
-
+    libjansson-devel version >= 2.9
+    librados2-devel (rados header) version >= 10.2.5
+    dovecot-devel (dovecot header)
+
 If you are using CentOS make sure you also have the following package installed:
 
     yum install redhat-rpm-config
-
 
 ### Standard installation in /usr/local
 

src/librmb/rados-cluster-impl.cpp

@@ -76,9 +76,7 @@ int RadosClusterImpl::init(const std::string &clustername, const std::string &ra
 int RadosClusterImpl::initialize() {
   int ret = 0;
 
-  if (ret == 0) {
-    ret = RadosClusterImpl::cluster->conf_parse_env(nullptr);
-  }
+  ret = RadosClusterImpl::cluster->conf_parse_env(nullptr);
 
   if (ret == 0) {
     ret = RadosClusterImpl::cluster->conf_read_file(nullptr);

src/librmb/rados-namespace-manager.h

@@ -28,7 +28,7 @@ class RadosNamespaceManager {
   void set_config(RadosDovecotCephCfg *config_) { config = config_; }
   RadosDovecotCephCfg *get_config() { return config; }
 
-  void set_namespace_oid(std::string &namespace_oid_) { this->oid_suffix = oid_suffix; }
+  void set_namespace_oid(std::string &namespace_oid_) { this->oid_suffix = namespace_oid_; }
   bool lookup_key(const std::string &uid, std::string *value);
   bool add_namespace_entry(const std::string &uid, std::string *value, RadosGuidGenerator *guid_generator_);
 

src/librmb/tools/rmb/rmb.cpp

@@ -573,7 +573,7 @@ int main(int argc, const char **argv) {
     usage_exit();
   }
 
-  if (args.size() <= 0 && opts.size() <= 0 && !is_config_option) {
+  if (args.empty() && opts.empty() && !is_config_option) {
     usage_exit();
   }
 

src/storage-rbox/rbox-mailbox-list-fs.cpp

@@ -93,7 +93,6 @@ static int rbox_list_is_maildir_mailbox(struct mailbox_list *list, const char *d
       *flags_r |= MAILBOX_CHILDREN;
   }
   *flags_r |= MAILBOX_SELECT;
-  return 1;
   FUNC_END();
   return 1;
 }
@@ -251,7 +250,6 @@ int rbox_fs_list_get_mailbox_flags(struct mailbox_list *list, const char *dir, c
       else if (st.st_nlink > 2)
         *flags_r |= MAILBOX_CHILDREN;
     }
-    return 1;
   FUNC_END();
   return 1;
 }

src/storage-rbox/rbox-storage.cpp

@@ -336,7 +336,7 @@ int read_plugin_configuration(struct mailbox *box) {
 
   if (!storage->config->is_config_valid()) {
     std::map<std::string, std::string> *map = storage->config->get_config();
-    for (std::map<std::string, std::string>::iterator it = map->begin(); it != map->end(); it++) {
+    for (std::map<std::string, std::string>::iterator it = map->begin(); it != map->end(); ++it) {
       std::string setting = it->first;
       storage->config->update_metadata(setting, mail_user_plugin_getenv(mbox->storage->storage.user, setting.c_str()));
     }