config: some improvements on callbacks

- ASSERT against nullpointer - always use the callback instead of the function directly
bareos · Sep 17, 2018 · c044a2a · c044a2a
1 parent 3ddbfb0
commit c044a2a
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 7 deletions.
diff --git a/core/src/dird/dird_conf.cc b/core/src/dird/dird_conf.cc
@@ -3892,7 +3892,7 @@ static void DumpResource(int type,
 
 bail_out:
   if (recurse && res->res_dir.hdr.next) {
-    DumpResource(type, res->res_dir.hdr.next, sendit, sock, hide_sensitive_data, verbose);
+    my_config->DumpResourceCb_(type, res->res_dir.hdr.next, sendit, sock, hide_sensitive_data, verbose);
   }
 }
 
@@ -4122,7 +4122,7 @@ static void FreeResource(CommonResourceHeader *sres, int type)
    * Common stuff again -- free the resource, recurse to next one
    */
   if (res) { free(res); }
-  if (nres) { FreeResource(nres, type); }
+  if (nres) { my_config->FreeResourceCb_(nres, type); }
 }
 
 /**

diff --git a/core/src/filed/filed_conf.cc b/core/src/filed/filed_conf.cc
@@ -367,7 +367,7 @@ static void DumpResource(int type,
   sendit(sock, "%s", buf.c_str());
 
   if (recurse && res->res_dir.hdr.next) {
-    DumpResource(type, res->res_dir.hdr.next, sendit, sock, hide_sensitive_data, verbose);
+    my_config->DumpResourceCb_(type, res->res_dir.hdr.next, sendit, sock, hide_sensitive_data, verbose);
   }
 }
 
@@ -471,7 +471,7 @@ static void FreeResource(CommonResourceHeader *sres, int type)
   }
   /* Common stuff again -- free the resource, recurse to next one */
   if (res) { free(res); }
-  if (nres) { FreeResource(nres, type); }
+  if (nres) { my_config->FreeResourceCb_(nres, type); }
 }
 
 /**

diff --git a/core/src/lib/parse_conf.cc b/core/src/lib/parse_conf.cc
@@ -98,7 +98,11 @@ ConfigurationParser::ConfigurationParser()
    , r_own_ (0)
    , resources_ (0)
    , res_head_(nullptr)
-   , use_config_include_dir_ (false) {
+   , use_config_include_dir_ (false)
+   , ParseConfigReadyCb_(nullptr)
+   , SaveResourceCb_(nullptr)
+   , DumpResourceCb_(nullptr)
+   , FreeResourceCb_(nullptr) {
    return;
 }
 
@@ -142,6 +146,9 @@ ConfigurationParser::ConfigurationParser(
    config_default_filename_ = config_default_filename == nullptr ? "" : config_default_filename;
    config_include_dir_ = config_include_dir == nullptr ? "" : config_include_dir;
    ParseConfigReadyCb_ = ParseConfigReadyCb;
+   ASSERT(SaveResourceCb);
+   ASSERT(DumpResourceCb);
+   ASSERT(FreeResourceCb);
    SaveResourceCb_ = SaveResourceCb;
    DumpResourceCb_ = DumpResourceCb;
    FreeResourceCb_ = FreeResourceCb;

diff --git a/core/src/stored/stored_conf.cc b/core/src/stored/stored_conf.cc
@@ -645,7 +645,7 @@ static void DumpResource(int type,
   sendit(sock, "%s", buf.c_str());
 
   if (recurse && res->res_dir.hdr.next) {
-    DumpResource(type, (CommonResourceHeader *)res->res_dir.hdr.next, sendit, sock, hide_sensitive_data,
+    my_config->DumpResourceCb_(type, (CommonResourceHeader *)res->res_dir.hdr.next, sendit, sock, hide_sensitive_data,
                  verbose);
   }
 }
@@ -901,7 +901,7 @@ static void FreeResource(CommonResourceHeader *sres, int type)
    * Common stuff again -- free the resource, recurse to next one
    */
   if (res) { free(res); }
-  if (nres) { FreeResource(nres, type); }
+  if (nres) { my_config->FreeResourceCb_(nres, type); }
 }
 
 } /* namespace storagedaemon  */