diff options
author | Alaa Eddine Elamri <alaeddine.elamri@bareos.com> | 2022-08-23 14:42:06 +0300 |
---|---|---|
committer | Philipp Storz <philipp.storz@bareos.com> | 2022-09-19 11:49:56 +0300 |
commit | 8309c5894401072bd798697a1517e502d53c7602 (patch) | |
tree | fa06fe02c8dcdff53416659240a07f26be9bad45 | |
parent | 6d333426ae18b2a412f20b93c2c2dad6624ed81f (diff) |
ua_prune.cc: rename variable and change alist type to match context
-rw-r--r-- | core/src/dird/ua_prune.cc | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/core/src/dird/ua_prune.cc b/core/src/dird/ua_prune.cc index f67270b98..afd715bef 100644 --- a/core/src/dird/ua_prune.cc +++ b/core/src/dird/ua_prune.cc @@ -686,8 +686,8 @@ bool PruneJobs(UaContext* ua, ClientResource* client, PoolResource* pool) * Note: The DISTINCT could be more useful if we don't get FileSetId */ - std::unique_ptr<alist<JobId_t*>> jobids_check - = std::make_unique<alist<JobId_t*>>(10, owned_by_alist); + std::unique_ptr<alist<accurate_check_ctx*>> accurate_job_check + = std::make_unique<alist<accurate_check_ctx*>>(10, owned_by_alist); Mmsg(query, "SELECT DISTINCT Job.Name, FileSet, Client.Name, Job.FileSetId, " "Job.ClientId, Job.Type " @@ -704,7 +704,8 @@ bool PruneJobs(UaContext* ua, ClientResource* client, PoolResource* pool) * in the configuration file. Interesting ClientId/FileSetId will be * added to jobids_check. */ - if (!ua->db->SqlQuery(query.c_str(), JobSelectHandler, jobids_check.get())) { + if (!ua->db->SqlQuery(query.c_str(), JobSelectHandler, + accurate_job_check.get())) { ua->ErrorMsg("%s", ua->db->strerror()); } @@ -721,7 +722,7 @@ bool PruneJobs(UaContext* ua, ClientResource* client, PoolResource* pool) struct accurate_check_ctx* elt = nullptr; db_list_ctx jobids; db_list_ctx tempids; - foreach_alist (elt, jobids_check) { + foreach_alist (elt, accurate_job_check) { jr.ClientId = elt->ClientId; /* should be always the same */ jr.FileSetId = elt->FileSetId; ua->db->AccurateGetJobids(ua->jcr, &jr, &tempids); |