jcr: remove the size argument and memset from new_jcr

bareos · Nov 7, 2019 · f62b3be · f62b3be
1 parent 2de0649
commit f62b3be
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 11 deletions.
diff --git a/core/src/dird/job.cc b/core/src/dird/job.cc
@@ -1695,7 +1695,7 @@ void GetJobStorage(UnifiedStorageResource* store,
 
 JobControlRecord* NewDirectorJcr()
 {
-  JobControlRecord* jcr = new_jcr(sizeof(JobControlRecord), DirdFreeJcr);
+  JobControlRecord* jcr = new_jcr(DirdFreeJcr);
   jcr->impl_ = new JobControlRecordPrivate;
   return jcr;
 }

diff --git a/core/src/filed/dir_cmd.cc b/core/src/filed/dir_cmd.cc
@@ -412,7 +412,7 @@ static inline bool AreMaxConcurrentJobsExceeded()
 
 static JobControlRecord* NewFiledJcr()
 {
-  JobControlRecord* jcr = new_jcr(sizeof(JobControlRecord), FiledFreeJcr);
+  JobControlRecord* jcr = new_jcr(FiledFreeJcr);
   jcr->impl_ = new JobControlRecordPrivate;
   return jcr;
 }

diff --git a/core/src/include/jcr.h b/core/src/include/jcr.h
@@ -377,7 +377,7 @@ class JobControlRecord {
  */
 extern int GetNextJobidFromList(char** p, uint32_t* JobId);
 extern bool InitJcrSubsystem(int timeout);
-extern JobControlRecord* new_jcr(int size, JCR_free_HANDLER* daemon_free_jcr);
+extern JobControlRecord* new_jcr(JCR_free_HANDLER* daemon_free_jcr);
 extern JobControlRecord* get_jcr_by_id(uint32_t JobId);
 extern JobControlRecord* get_jcr_by_session(uint32_t SessionId,
                                             uint32_t SessionTime);

diff --git a/core/src/lib/jcr.cc b/core/src/lib/jcr.cc
@@ -224,13 +224,12 @@ JobControlRecord::JobControlRecord()
   SetTimeoutHandler();
 }
 
-JobControlRecord* new_jcr(int size, JCR_free_HANDLER* daemon_free_jcr)
+JobControlRecord* new_jcr(JCR_free_HANDLER* daemon_free_jcr)
 {
   Dmsg0(debuglevel, "Enter new_jcr\n");
 
-  JobControlRecord* jcr;
-  jcr = (JobControlRecord*)malloc(size);
-  memset(jcr, 0, size);
+  JobControlRecord* jcr =
+      static_cast<JobControlRecord*>(malloc(sizeof(JobControlRecord)));
   jcr = new (jcr) JobControlRecord();
 
   jcr->daemon_free_jcr = daemon_free_jcr;

diff --git a/core/src/stored/bscan.cc b/core/src/stored/bscan.cc
@@ -1549,7 +1549,7 @@ static JobControlRecord* create_jcr(JobDbRecord* jr,
    * Transfer as much as possible to the Job JobControlRecord. Most important is
    *   the JobId and the ClientId.
    */
-  jobjcr = new_jcr(sizeof(JobControlRecord), BscanFreeJcr);
+  jobjcr = new_jcr(BscanFreeJcr);
   jobjcr->impl_ = new JobControlRecordPrivate;
   jobjcr->setJobType(jr->JobType);
   jobjcr->setJobLevel(jr->JobLevel);

diff --git a/core/src/stored/butil.cc b/core/src/stored/butil.cc
@@ -68,7 +68,7 @@ JobControlRecord* SetupJcr(const char* name,
                            const char* VolumeName,
                            bool readonly)
 {
-  JobControlRecord* jcr = new_jcr(sizeof(JobControlRecord), MyFreeJcr);
+  JobControlRecord* jcr = new_jcr(MyFreeJcr);
   jcr->impl_ = new JobControlRecordPrivate;
 
   jcr->impl_->bsr = bsr;

diff --git a/core/src/stored/job.cc b/core/src/stored/job.cc
@@ -517,7 +517,7 @@ void StoredFreeJcr(JobControlRecord* jcr)
 
 JobControlRecord* NewStoredJcr()
 {
-  JobControlRecord* jcr = new_jcr(sizeof(JobControlRecord), StoredFreeJcr);
+  JobControlRecord* jcr = new_jcr(StoredFreeJcr);
   jcr->impl_ = new JobControlRecordPrivate;
   return jcr;
 }

diff --git a/core/src/tools/btestls.cc b/core/src/tools/btestls.cc
@@ -133,7 +133,7 @@ int main(int argc, char* const* argv)
   argc -= optind;
   argv += optind;
 
-  jcr = new_jcr(sizeof(JobControlRecord), NULL);
+  jcr = new_jcr(nullptr);
 
   ff = init_find_files();
   if (argc == 0 && !inc) {