[prev in list] [next in list] [prev in thread] [next in thread]
List: bacula-commits
Subject: [Bacula-commits] SF.net SVN: bacula:[7507] trunk/bacula/src
From: kerns () users ! sourceforge ! net
Date: 2008-08-26 13:00:34
Message-ID: E1KXy9y-0006V8-Gy () dn4whf1 ! ch3 ! sourceforge ! com
[Download RAW message or body]
Revision: 7507
http://bacula.svn.sourceforge.net/bacula/?rev=7507&view=rev
Author: kerns
Date: 2008-08-26 13:00:32 +0000 (Tue, 26 Aug 2008)
Log Message:
-----------
minor tweaks
Modified Paths:
--------------
trunk/bacula/src/cats/sql_list.c
trunk/bacula/src/dird/recycle.c
trunk/bacula/src/dird/ua_cmds.c
trunk/bacula/src/dird/ua_label.c
trunk/bacula/src/dird/ua_update.c
Modified: trunk/bacula/src/cats/sql_list.c
===================================================================
--- trunk/bacula/src/cats/sql_list.c 2008-08-25 07:41:08 UTC (rev 7506)
+++ trunk/bacula/src/cats/sql_list.c 2008-08-26 13:00:32 UTC (rev 7507)
@@ -1,7 +1,7 @@
/*
Bacula ® - The Network Backup Solution
- Copyright (C) 2000-2007 Free Software Foundation Europe e.V.
+ Copyright (C) 2000-2008 Free Software Foundation Europe e.V.
The main author of Bacula is Kern Sibbald, with contributions from
many others, a complete list can be found in the file AUTHORS.
Modified: trunk/bacula/src/dird/recycle.c
===================================================================
--- trunk/bacula/src/dird/recycle.c 2008-08-25 07:41:08 UTC (rev 7506)
+++ trunk/bacula/src/dird/recycle.c 2008-08-26 13:00:32 UTC (rev 7507)
@@ -1,7 +1,7 @@
/*
Bacula ® - The Network Backup Solution
- Copyright (C) 2002-2007 Free Software Foundation Europe e.V.
+ Copyright (C) 2002-2008 Free Software Foundation Europe e.V.
The main author of Bacula is Kern Sibbald, with contributions from
many others, a complete list can be found in the file AUTHORS.
Modified: trunk/bacula/src/dird/ua_cmds.c
===================================================================
--- trunk/bacula/src/dird/ua_cmds.c 2008-08-25 07:41:08 UTC (rev 7506)
+++ trunk/bacula/src/dird/ua_cmds.c 2008-08-26 13:00:32 UTC (rev 7507)
@@ -1,7 +1,7 @@
/*
Bacula ® - The Network Backup Solution
- Copyright (C) 2000-2007 Free Software Foundation Europe e.V.
+ Copyright (C) 2000-2008 Free Software Foundation Europe e.V.
The main author of Bacula is Kern Sibbald, with contributions from
many others, a complete list can be found in the file AUTHORS.
Modified: trunk/bacula/src/dird/ua_label.c
===================================================================
--- trunk/bacula/src/dird/ua_label.c 2008-08-25 07:41:08 UTC (rev 7506)
+++ trunk/bacula/src/dird/ua_label.c 2008-08-26 13:00:32 UTC (rev 7507)
@@ -1,7 +1,7 @@
/*
Bacula ® - The Network Backup Solution
- Copyright (C) 2003-2007 Free Software Foundation Europe e.V.
+ Copyright (C) 2003-2008 Free Software Foundation Europe e.V.
The main author of Bacula is Kern Sibbald, with contributions from
many others, a complete list can be found in the file AUTHORS.
@@ -678,14 +678,14 @@
bash_spaces(pr->Name);
if (relabel) {
bash_spaces(omr->VolumeName);
- bnet_fsend(sd, "relabel %s OldName=%s NewName=%s PoolName=%s "
+ sd->fsend("relabel %s OldName=%s NewName=%s PoolName=%s "
"MediaType=%s Slot=%d drive=%d",
dev_name, omr->VolumeName, mr->VolumeName, pr->Name,
mr->MediaType, mr->Slot, drive);
ua->send_msg(_("Sending relabel command from \"%s\" to \"%s\" ...\n"),
omr->VolumeName, mr->VolumeName);
} else {
- bnet_fsend(sd, "label %s VolumeName=%s PoolName=%s MediaType=%s "
+ sd->fsend("label %s VolumeName=%s PoolName=%s MediaType=%s "
"Slot=%d drive=%d",
dev_name, mr->VolumeName, pr->Name, mr->MediaType,
mr->Slot, drive);
@@ -695,7 +695,7 @@
dev_name, mr->VolumeName, pr->Name, mr->MediaType, mr->Slot, drive);
}
- while (bnet_recv(sd) >= 0) {
+ while (sd->recv() >= 0) {
int dvd;
ua->send_msg("%s", sd->msg);
if (sscanf(sd->msg, "3000 OK label. VolBytes=%llu DVD=%d ", &VolBytes,
@@ -787,11 +787,11 @@
bstrncpy(dev_name, store->dev_name(), sizeof(dev_name));
bash_spaces(dev_name);
/* Ask for autochanger list of volumes */
- bnet_fsend(sd, NT_("readlabel %s Slot=%d drive=%d\n"), dev_name, Slot, drive);
+ sd->fsend(NT_("readlabel %s Slot=%d drive=%d\n"), dev_name, Slot, drive);
Dmsg1(100, "Sent: %s", sd->msg);
/* Get Volume name in this Slot */
- while (bnet_recv(sd) >= 0) {
+ while (sd->recv() >= 0) {
ua->send_msg("%s", sd->msg);
Dmsg1(100, "Got: %s", sd->msg);
if (strncmp(sd->msg, NT_("3001 Volume="), 12) == 0) {
@@ -941,9 +941,9 @@
bstrncpy(dev_name, store->dev_name(), sizeof(dev_name));
bash_spaces(dev_name);
/* Ask for autochanger number of slots */
- bnet_fsend(sd, NT_("autochanger slots %s\n"), dev_name);
+ sd->fsend(NT_("autochanger slots %s\n"), dev_name);
- while (bnet_recv(sd) >= 0) {
+ while (sd->recv() >= 0) {
if (sscanf(sd->msg, "slots=%d\n", &slots) == 1) {
break;
} else {
@@ -973,9 +973,9 @@
bstrncpy(dev_name, store->dev_name(), sizeof(dev_name));
bash_spaces(dev_name);
/* Ask for autochanger number of slots */
- bnet_fsend(sd, NT_("autochanger drives %s\n"), dev_name);
+ sd->fsend(NT_("autochanger drives %s\n"), dev_name);
- while (bnet_recv(sd) >= 0) {
+ while (sd->recv() >= 0) {
if (sscanf(sd->msg, NT_("drives=%d\n"), &drives) == 1) {
break;
} else {
@@ -1079,55 +1079,55 @@
if (!vl->VolName) {
Dmsg1(100, "No VolName for Slot=%d.\n", vl->Slot);
- if (!ua->api) {
- ua->info_msg(_(" %4i%c| %16s | %9s | %10s | %18s | %i |\n"),
- vl->Slot, '*',
- "?", "?", "?", "?", 0);
- } else {
- ua->info_msg(_("%i||||||\n"), vl->Slot);
- }
+ if (!ua->api) {
+ ua->info_msg(_(" %4i%c| %16s | %9s | %10s | %18s | %i |\n"),
+ vl->Slot, '*',
+ "?", "?", "?", "?", 0);
+ } else {
+ ua->info_msg(_("%i||||||\n"), vl->Slot);
+ }
continue;
}
/* Hope that slots are ordered */
for (; i < vl->Slot; i++) {
- if (slot_list[i]) {
- if (!ua->api) {
- ua->info_msg(_(" %4i | %16s | %9s | %10s | %18s | %i |\n"),
- i, "", "", "", "", 0);
- } else {
- ua->info_msg(_("%i||||||\n"), i);
- }
- slot_list[i]=0;
- }
+ if (slot_list[i]) {
+ if (!ua->api) {
+ ua->info_msg(_(" %4i | %16s | %9s | %10s | %18s | %i |\n"),
+ i, "", "", "", "", 0);
+ } else {
+ ua->info_msg(_("%i||||||\n"), i);
+ }
+ slot_list[i]=0;
+ }
}
memset(&mr, 0, sizeof(mr));
bstrncpy(mr.VolumeName, vl->VolName, sizeof(mr.VolumeName));
db_lock(ua->db);
if (mr.VolumeName[0] && db_get_media_record(ua->jcr, ua->db, &mr)) {
- memset(&pr, 0, sizeof(POOL_DBR));
- pr.PoolId = mr.PoolId;
- if (!db_get_pool_record(ua->jcr, ua->db, &pr)) {
- strcpy(pr.Name, "?");
- }
+ memset(&pr, 0, sizeof(POOL_DBR));
+ pr.PoolId = mr.PoolId;
+ if (!db_get_pool_record(ua->jcr, ua->db, &pr)) {
+ strcpy(pr.Name, "?");
+ }
- if (!ua->api) {
- /* Print information */
- ua->info_msg(_(" %4i%c| %16s | %9s | %10s | %18s | %i |\n"),
- vl->Slot, ((vl->Slot==mr.Slot)?' ':'*'),
- mr.VolumeName, mr.VolStatus, mr.MediaType, pr.Name, 0);
- } else {
- ua->info_msg(_("%i|%i|%s|%s|%s|%s|%i|\n"),
- vl->Slot, mr.Slot, mr.VolumeName, mr.VolStatus, mr.MediaType, pr.Name, 0);
- }
+ if (!ua->api) {
+ /* Print information */
+ ua->info_msg(_(" %4i%c| %16s | %9s | %10s | %18s | %i |\n"),
+ vl->Slot, ((vl->Slot==mr.Slot)?' ':'*'),
+ mr.VolumeName, mr.VolStatus, mr.MediaType, pr.Name, 0);
+ } else {
+ ua->info_msg(_("%i|%i|%s|%s|%s|%s|%i|\n"),
+ vl->Slot, mr.Slot, mr.VolumeName, mr.VolStatus, \
mr.MediaType, pr.Name, 0); + }
db_unlock(ua->db);
continue;
- } else { /* TODO: get information from catalog */
- ua->info_msg(_(" %4i%c| %16s | %9s | %10s | %18s | %i |\n"),
- vl->Slot, '*',
- mr.VolumeName, "?", "?", "?", 0);
+ } else { /* TODO: get information from catalog */
+ ua->info_msg(_(" %4i%c| %16s | %9s | %10s | %18s | %i |\n"),
+ vl->Slot, '*',
+ mr.VolumeName, "?", "?", "?", 0);
}
db_unlock(ua->db);
}
@@ -1136,13 +1136,13 @@
*/
for (; i <= max_slots; i++) {
if (slot_list[i]) {
- if (!ua->api) {
- ua->info_msg(_(" %4i | %16s | %9s | %10s | %18s | %i |\n"),
- i, "", "", "", "", 0);
- } else {
- ua->info_msg(_("%i||||||\n"), i);
- }
- slot_list[i]=0;
+ if (!ua->api) {
+ ua->info_msg(_(" %4i | %16s | %9s | %10s | %18s | %i |\n"),
+ i, "", "", "", "", 0);
+ } else {
+ ua->info_msg(_("%i||||||\n"), i);
+ }
+ slot_list[i]=0;
}
}
Modified: trunk/bacula/src/dird/ua_update.c
===================================================================
--- trunk/bacula/src/dird/ua_update.c 2008-08-25 07:41:08 UTC (rev 7506)
+++ trunk/bacula/src/dird/ua_update.c 2008-08-26 13:00:32 UTC (rev 7507)
@@ -774,9 +774,9 @@
} else {
ua->info_msg(_("No current RecyclePool\n"));
}
- if (!select_pool_dbr(ua, &pr, NT_("recyclepool"))) {
- return 0;
- }
+ if (!select_pool_dbr(ua, &pr, NT_("recyclepool"))) {
+ return 0;
+ }
update_vol_recyclepool(ua, pr.Name, &mr);
return 1;
This was sent by the SourceForge.net collaborative development platform, the world's \
largest Open Source development site.
-------------------------------------------------------------------------
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/
_______________________________________________
Bacula-commits mailing list
Bacula-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/bacula-commits
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic