From: Eric Bollengier Date: Thu, 16 Jul 2009 19:58:54 +0000 (+0000) Subject: Replace info_msg by send_msg in status_slots for bat X-Git-Tag: Release-3.0.2~30 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=fb09f09c40bac063610516dfe9af8e8b37a40955;p=bacula%2Fbacula Replace info_msg by send_msg in status_slots for bat git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@9036 91ce42f0-d328-0410-95d8-f526ca767f89 --- diff --git a/bacula/src/dird/ua_label.c b/bacula/src/dird/ua_label.c index ce609da878..b464be19c9 100644 --- a/bacula/src/dird/ua_label.c +++ b/bacula/src/dird/ua_label.c @@ -1063,8 +1063,8 @@ void status_slots(UAContext *ua, STORE *store_r) goto bail_out; } if (!ua->api) { - ua->info_msg(_(" Slot | Volume Name | Status | Media Type | Pool |\n")); - ua->info_msg(_("------+------------------+-----------+----------------------+--------------------|\n")); + ua->send_msg(_(" Slot | Volume Name | Status | Media Type | Pool |\n")); + ua->send_msg(_("------+------------------+-----------+----------------------+--------------------|\n")); } /* Walk through the list getting the media records */ @@ -1085,11 +1085,11 @@ void status_slots(UAContext *ua, STORE *store_r) if (!vl->VolName) { Dmsg1(100, "No VolName for Slot=%d.\n", vl->Slot); if (!ua->api) { - ua->info_msg(slot_hformat, + ua->send_msg(slot_hformat, vl->Slot, '*', "?", "?", "?", "?"); } else { - ua->info_msg(slot_api_empty_format, vl->Slot); + ua->send_msg(slot_api_empty_format, vl->Slot); } continue; } @@ -1098,10 +1098,10 @@ void status_slots(UAContext *ua, STORE *store_r) for (; i < vl->Slot; i++) { if (slot_list[i]) { if (!ua->api) { - ua->info_msg(slot_hformat, + ua->send_msg(slot_hformat, i, ' ', "", "", "", ""); } else { - ua->info_msg(slot_api_empty_format, i); + ua->send_msg(slot_api_empty_format, i); } slot_list[i]=0; } @@ -1119,11 +1119,11 @@ void status_slots(UAContext *ua, STORE *store_r) if (!ua->api) { /* Print information */ - ua->info_msg(slot_hformat, + ua->send_msg(slot_hformat, vl->Slot, ((vl->Slot==mr.Slot)?' ':'*'), mr.VolumeName, mr.VolStatus, mr.MediaType, pr.Name); } else { - ua->info_msg(slot_api_full_format, + ua->send_msg(slot_api_full_format, vl->Slot, mr.Slot, mr.VolumeName, mr.VolStatus, mr.MediaType, pr.Name); } @@ -1131,7 +1131,7 @@ void status_slots(UAContext *ua, STORE *store_r) db_unlock(ua->db); continue; } else { /* TODO: get information from catalog */ - ua->info_msg(slot_hformat, + ua->send_msg(slot_hformat, vl->Slot, '*', mr.VolumeName, "?", "?", "?"); } @@ -1143,10 +1143,10 @@ void status_slots(UAContext *ua, STORE *store_r) for (; i <= max_slots; i++) { if (slot_list[i]) { if (!ua->api) { - ua->info_msg(slot_hformat, + ua->send_msg(slot_hformat, i, ' ', "", "", "", ""); } else { - ua->info_msg(slot_api_empty_format, i); + ua->send_msg(slot_api_empty_format, i); } slot_list[i]=0; }