catreq.cc: add scoped initializers

bareos · Nov 5, 2019 · 707052e · 707052e
1 parent 2f078e6
commit 707052e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git a/core/src/dird/catreq.cc b/core/src/dird/catreq.cc
@@ -45,8 +45,6 @@
 
 namespace directordaemon {
 
-static const PoolDbRecord emptyPoolDbRecord = {};
-
 /*
  * Handle catalog request
  *  For now, we simply return next Volume to be used
@@ -116,7 +114,6 @@ void CatalogRequest(JobControlRecord* jcr, BareosSocket* bs)
   PoolMem unwanted_volumes(PM_MESSAGE);
   int index, ok, label, writing;
   POOLMEM* omsg;
-  PoolDbRecord pr;
   uint32_t Stripe, Copy;
   uint64_t MediaId;
   utime_t VolFirstWritten;
@@ -142,7 +139,7 @@ void CatalogRequest(JobControlRecord* jcr, BareosSocket* bs)
   unwanted_volumes.check_size(bs->message_length);
   if (sscanf(bs->msg, Find_media, &Job, &index, &pool_name, &mr.MediaType,
              unwanted_volumes.c_str()) == 5) {
-    pr = emptyPoolDbRecord;
+    PoolDbRecord pr;
     bstrncpy(pr.Name, pool_name, sizeof(pr.Name));
     UnbashSpaces(pr.Name);
     ok = jcr->db->GetPoolRecord(jcr, &pr);

diff --git a/core/src/dird/consolidate.cc b/core/src/dird/consolidate.cc
@@ -255,7 +255,7 @@ bool DoConsolidate(JobControlRecord* jcr)
         /**
          * Get db record of oldest jobid and check its age
          */
-        static const JobDbRecord emptyJobDbRecord{};
+        JobDbRecord emptyJobDbRecord{};
         jcr->previous_jr = emptyJobDbRecord;
         jcr->previous_jr.JobId = str_to_int64(jobids);
         Dmsg1(10, "Previous JobId=%s\n", jobids);