config: rename ResHeadContainer -> ConfigResourcesContainer

bareos · Aug 4, 2022 · 6f5e168 · 6f5e168
1 parent 4d60c18
commit 6f5e168
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 14 deletions.
diff --git a/core/src/dird/jcr_private.h b/core/src/dird/jcr_private.h
@@ -31,7 +31,7 @@
 
 typedef struct s_tree_root TREE_ROOT;
 
-class ResHeadContainer;
+class ConfigResourcesContainer;
 
 namespace directordaemon {
 class JobResource;
@@ -96,14 +96,14 @@ struct Resources {
 };
 
 struct JobControlRecordPrivate {
-  JobControlRecordPrivate( std::shared_ptr<ResHeadContainer> configuration_resources_container) {
+  JobControlRecordPrivate( std::shared_ptr<ConfigResourcesContainer> configuration_resources_container) {
     job_config_resources_container_ = configuration_resources_container;
     RestoreJobId = 0; MigrateJobId = 0; VerifyJobId = 0;
   }
   ~JobControlRecordPrivate() {
     job_config_resources_container_ = nullptr;
   }
-  std::shared_ptr<ResHeadContainer> job_config_resources_container_;
+  std::shared_ptr<ConfigResourcesContainer> job_config_resources_container_;
   pthread_t SD_msg_chan{};        /**< Message channel thread id */
   bool SD_msg_chan_started{};     /**< Message channel thread started */
   pthread_cond_t term_wait = PTHREAD_COND_INITIALIZER;      /**< Wait for job termination */

diff --git a/core/src/lib/parse_conf.cc b/core/src/lib/parse_conf.cc
@@ -136,7 +136,7 @@ ConfigurationParser::ConfigurationParser(
   err_type_ = err_type;
   r_num_ = r_num;
   resource_definitions_ = resource_definitions;
-  config_resources_container_.reset(new ResHeadContainer(this));
+  config_resources_container_.reset(new ConfigResourcesContainer(this));
   config_default_filename_
       = config_default_filename == nullptr ? "" : config_default_filename;
   config_include_dir_ = config_include_dir == nullptr ? "" : config_include_dir;
@@ -527,7 +527,7 @@ void ConfigurationParser::RestoreResourceTable()
 void ConfigurationParser::BackupResourceTable()
 {
   std::swap(config_resources_container_, config_resources_container_backup_);
-  config_resources_container_.reset(new ResHeadContainer(this));
+  config_resources_container_.reset(new ConfigResourcesContainer(this));
 }
 
 bool ConfigurationParser::RemoveResource(int rcode, const char* name)

diff --git a/core/src/lib/parse_conf.h b/core/src/lib/parse_conf.h
@@ -41,7 +41,7 @@
 struct ResourceItem;
 class ConfigParserStateMachine;
 class ConfigurationParser;
-class ResHeadContainer;
+class ConfigResourcesContainer;
 /* For storing name_addr items in res_items table */
 
 /* using offsetof on non-standard-layout types is conditionally supported. As
@@ -219,8 +219,8 @@ class ConfigurationParser {
   BareosResource* own_resource_; /* Pointer to own resource */
   ResourceTable*
       resource_definitions_; /* Pointer to table of permitted resources */
-  std::shared_ptr<ResHeadContainer> config_resources_container_;
-  std::shared_ptr<ResHeadContainer> config_resources_container_backup_;
+  std::shared_ptr<ConfigResourcesContainer> config_resources_container_;
+  std::shared_ptr<ConfigResourcesContainer> config_resources_container_backup_;
   mutable brwlock_t res_lock_; /* Resource lock */
 
   SaveResourceCb_t SaveResourceCb_;
@@ -430,28 +430,28 @@ static std::string TPAsString(const std::chrono::system_clock::time_point& tp)
   return ts;
 }
 
-class ResHeadContainer {
+class ConfigResourcesContainer {
  public:
   std::chrono::time_point<std::chrono::system_clock> timestamp_{};
   BareosResource** configuration_resources_ = nullptr;
   ConfigurationParser* config_ = nullptr;
 
-  ResHeadContainer(ConfigurationParser* config)
+  ConfigResourcesContainer(ConfigurationParser* config)
   {
     config_ = config;
     int num = config_->r_num_;
     configuration_resources_
         = (BareosResource**)malloc(num * sizeof(BareosResource*));
 
     for (int i = 0; i < num; i++) { configuration_resources_[i] = nullptr; }
-    Dmsg1(10, "ResHeadContainer: new configuration_resources_ %p\n",
+    Dmsg1(10, "ConfigResourcesContainer: new configuration_resources_ %p\n",
           configuration_resources_);
   }
 
-  ~ResHeadContainer()
+  ~ConfigResourcesContainer()
   {
-    Dmsg1(10, "ResHeadContainer freeing %p %s\n", configuration_resources_,
-          TPAsString(timestamp_).c_str());
+    Dmsg1(10, "ConfigResourcesContainer freeing %p %s\n",
+          configuration_resources_, TPAsString(timestamp_).c_str());
     int num = config_->r_num_;
     for (int j = 0; j < num; j++) {
       config_->FreeResourceCb_(configuration_resources_[j], j);