fixup: more review fixes

bareos · Oct 15, 2019 · e0a88eb · e0a88eb
1 parent 2ceca5c
commit e0a88eb
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 17 deletions.
diff --git a/core/src/filed/status.cc b/core/src/filed/status.cc
@@ -448,7 +448,6 @@ bool QstatusCmd(JobControlRecord* jcr)
   BareosSocket* dir = jcr->dir_bsock;
   POOLMEM* cmd;
   JobControlRecord* njcr;
-  RecentJobResultsList::JobResult* job;
   StatusPacket sp;
 
   sp.bs = dir;

diff --git a/core/src/include/jcr.h b/core/src/include/jcr.h
@@ -48,6 +48,7 @@
 
 #include "lib/alist.h"
 #include "lib/tree.h"
+#include "lib/volume_session_info.h"
 
 class dlist;
 
@@ -679,24 +680,14 @@ extern void b_free_jcr(const char* file, int line, JobControlRecord* jcr);
 typedef void(dbg_jcr_hook_t)(JobControlRecord* jcr, FILE* fp);
 extern void DbgJcrAddHook(dbg_jcr_hook_t* fct);
 
-struct SessionIdentifier {
-  uint32_t id_{0};
-  uint32_t time_{0};
-  SessionIdentifier(uint32_t id, uint32_t time) : id_(id), time_(time) {}
-  bool operator==(const SessionIdentifier& rhs) const
-  {
-    return id_ == rhs.id_ && time_ == rhs.time_;
-  }
-};
-
-/* new interface */
+/* new-2019 interface */
 void InitJcr(std::shared_ptr<JobControlRecord> jcr,
              JCR_free_HANDLER* daemon_free_jcr);
 std::size_t GetJcrCount();
 std::shared_ptr<JobControlRecord> GetJcrById(uint32_t JobId);
 std::shared_ptr<JobControlRecord> GetJcrByFullName(std::string name);
 std::shared_ptr<JobControlRecord> GetJcrByPartialName(std::string name);
-std::shared_ptr<JobControlRecord> GetJcrBySession(SessionIdentifier identifier);
+std::shared_ptr<JobControlRecord> GetJcrBySession(const VolumeSessionInfo& vsi);
 uint32_t GetJobIdByThreadId(pthread_t tid);
 /* ************* */
 

diff --git a/core/src/lib/jcr.cc b/core/src/lib/jcr.cc
@@ -543,11 +543,10 @@ std::shared_ptr<JobControlRecord> GetJcrByPartialName(std::string name)
   });
 }
 
-std::shared_ptr<JobControlRecord> GetJcrBySession(SessionIdentifier identifier)
+std::shared_ptr<JobControlRecord> GetJcrBySession(const VolumeSessionInfo& vsi)
 {
-  return GetJcr([&identifier](const JobControlRecord* jcr) {
-    return (SessionIdentifier{jcr->VolSessionId, jcr->VolSessionTime} ==
-            identifier);
+  return GetJcr([&vsi](const JobControlRecord* jcr) {
+    return (VolumeSessionInfo{jcr->VolSessionId, jcr->VolSessionTime} == vsi);
   });
 }
 

diff --git a/core/src/lib/volume_session_info.h b/core/src/lib/volume_session_info.h
@@ -30,6 +30,10 @@ struct VolumeSessionInfo {
 
   /* explicit constructor disables default construction */
   VolumeSessionInfo(uint32_t t_id, uint32_t t_time) : id(t_id), time(t_time) {}
+  bool operator==(const VolumeSessionInfo& rhs) const
+  {
+    return id == rhs.id && time == rhs.time;
+  }
 };
 
 #endif /**  BAREOS_LIB_VOLUME_SESSION_INFO_H_ */