del->PurgedFiles = (char *)brealloc(del->PurgedFiles, del->max_ids);
}
del->JobId[del->num_ids] = (JobId_t)str_to_int64(row[0]);
- del->PurgedFiles[del->num_ids++] = (char)str_to_int64(row[0]);
+ del->PurgedFiles[del->num_ids++] = (char)str_to_int64(row[1]);
return 0;
}
int kw;
static const char *keywords[] = {
- N_("Files"),
- N_("Jobs"),
- N_("Volume"),
+ NT_("Files"),
+ NT_("Jobs"),
+ NT_("Volume"),
NULL};
if (!open_db(ua)) {
{
struct s_job_del_ctx del;
struct s_count_ctx cnt;
- POOLMEM *query = (char *)get_pool_memory(PM_MESSAGE);
+ POOLMEM *query = get_pool_memory(PM_MESSAGE);
int i;
utime_t now, period;
CLIENT_DBR cr;
/*
* Prune a given Volume
*/
-int prune_volume(UAContext *ua, MEDIA_DBR *mr)
+bool prune_volume(UAContext *ua, MEDIA_DBR *mr)
{
- POOLMEM *query = (char *)get_pool_memory(PM_MESSAGE);
+ POOLMEM *query = get_pool_memory(PM_MESSAGE);
struct s_count_ctx cnt;
struct s_file_del_ctx del;
- int i, stat = 0;
+ int i;
+ bool ok = false;
JOB_DBR jr;
utime_t now, period;
char ed1[50];
+ if (mr->Enabled == 2) {
+ return false; /* Cannot prune archived volumes */
+ }
+
db_lock(ua->db);
memset(&jr, 0, sizeof(jr));
memset(&del, 0, sizeof(del));
if (strcmp(mr->VolStatus, "Append") == 0 && verbose) {
bsendmsg(ua, _("There are no Jobs associated with Volume \"%s\". Prune not needed.\n"),
mr->VolumeName);
- stat = 1;
+ ok = true;
goto bail_out;
}
/* If volume not already purged, do so */
bsendmsg(ua, _("There are no Jobs associated with Volume \"%s\". Marking it purged.\n"),
mr->VolumeName);
}
- stat = mark_media_purged(ua, mr);
+ ok = mark_media_purged(ua, mr);
goto bail_out;
}
}
if (cnt.count == 0) {
Dmsg0(200, "Volume is purged.\n");
- stat = mark_media_purged(ua, mr);
+ ok = mark_media_purged(ua, mr);
}
bail_out:
db_unlock(ua->db);
free_pool_memory(query);
- return stat;
+ return ok;
}