minor tweaks

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@7507 91ce42f0-d328-0410-95d8-f526ca767f89

diff --git a/bacula/src/cats/sql_list.c b/bacula/src/cats/sql_list.c
index a4a94d10f97c1f0942ab171919ca12f1461363c9..0ac41438160fc8b75ffc03996d5ce0f50513ce62 100644 (file)
--- a/bacula/src/cats/sql_list.c
+++ b/bacula/src/cats/sql_list.c
@@ -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.

diff --git a/bacula/src/dird/recycle.c b/bacula/src/dird/recycle.c
index c65d760eae91076f452a7c8f6d16dcc99cd51e20..e55d32a987bfc9c6c3ae8cc0004d138763106703 100644 (file)
--- a/bacula/src/dird/recycle.c
+++ b/bacula/src/dird/recycle.c
@@ -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.

diff --git a/bacula/src/dird/ua_cmds.c b/bacula/src/dird/ua_cmds.c
index ac4b89fc77bf5550e5c0fa5f66339499400ed210..3007f39241efd27b2b4996399c1cf8fa18223903 100644 (file)
--- a/bacula/src/dird/ua_cmds.c
+++ b/bacula/src/dird/ua_cmds.c
@@ -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.

diff --git a/bacula/src/dird/ua_label.c b/bacula/src/dird/ua_label.c
index b14452d55dc6554441a6f3f0676476a1a2abbfd7..c9b160bd58934bf60f3c11a458337cd9b989792f 100644 (file)
--- a/bacula/src/dird/ua_label.c
+++ b/bacula/src/dird/ua_label.c
@@ -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 @@ static bool send_label_request(UAContext *ua, MEDIA_DBR *mr, MEDIA_DBR *omr,
    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 @@ static bool send_label_request(UAContext *ua, MEDIA_DBR *mr, MEDIA_DBR *omr,
          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 @@ static char *get_volume_name_from_SD(UAContext *ua, int Slot, int drive)
    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 @@ static int get_num_slots_from_SD(UAContext *ua)
    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 @@ int get_num_drives_from_SD(UAContext *ua)
    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 @@ 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(_(" %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, "?");
-        }
-
-        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);
-        }
+         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);
+         }
 
          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 @@ void status_slots(UAContext *ua, STORE *store_r)
     */
    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;
       }
    }
 

diff --git a/bacula/src/dird/ua_update.c b/bacula/src/dird/ua_update.c
index 62f36174d1590ff3a0d2122e509de026bfb4ce9c..3e16222785329d1267fde5a5793b002c872fd3d7 100644 (file)
--- a/bacula/src/dird/ua_update.c
+++ b/bacula/src/dird/ua_update.c
@@ -774,9 +774,9 @@ static int update_volume(UAContext *ua)
          } 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;