refactor: remove unnecessary string conversions

bareos · Aug 5, 2023 · 8dc1d2e · 8dc1d2e
1 parent e1808c1
commit 8dc1d2e
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/core/src/dird/dird_conf.cc b/core/src/dird/dird_conf.cc
@@ -3093,38 +3093,38 @@ extern "C" std::optional<std::string> job_code_callback_director(JobControlRecor
   switch (param[0]) {
     case 'f':
       if (jcr->dir_impl->res.fileset) {
-        return std::string(jcr->dir_impl->res.fileset->resource_name_);
+        return jcr->dir_impl->res.fileset->resource_name_;
       }
       break;
     case 'h':
       if (jcr->dir_impl->res.client) {
-        return std::string(jcr->dir_impl->res.client->address);
+        return jcr->dir_impl->res.client->address;
       }
       break;
     case 'p':
       if (jcr->dir_impl->res.pool) {
-        return std::string(jcr->dir_impl->res.pool->resource_name_);
+        return jcr->dir_impl->res.pool->resource_name_;
       }
       break;
     case 'w':
       if (jcr->dir_impl->res.write_storage) {
-        return std::string(jcr->dir_impl->res.write_storage->resource_name_);
+        return jcr->dir_impl->res.write_storage->resource_name_;
       }
       break;
     case 'x':
       return jcr->dir_impl->spool_data ? yes : no;
     case 'C':
       return jcr->dir_impl->cloned ? yes : no;
     case 'D':
-      return std::string(my_name);
+      return my_name;
     case 'V':
       if (jcr) {
         /* If this is a migration/copy we need the volume name from the
          * mig_jcr. */
         if (jcr->dir_impl->mig_jcr) { jcr = jcr->dir_impl->mig_jcr; }
 
         if (jcr->VolumeName) {
-          return std::string(jcr->VolumeName);
+          return jcr->VolumeName;
         } else {
           return none;
         }

diff --git a/core/src/filed/fileset.cc b/core/src/filed/fileset.cc
@@ -60,7 +60,7 @@ extern "C" std::optional<std::string> job_code_callback_filed(JobControlRecord*
   switch (param[0]) {
     case 'D':
       if (jcr->fd_impl->director) {
-        return std::string(jcr->fd_impl->director->resource_name_);
+        return jcr->fd_impl->director->resource_name_;
       }
       break;
     case 'm':