From 70a77f676d96ee8cda1bada5a7abb75112be8e90 Mon Sep 17 00:00:00 2001
From: Kern Sibbald <kern@sibbald.com>
Date: Sat, 4 Jun 2005 08:24:33 +0000
Subject: [PATCH] Minor changes

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@2103 91ce42f0-d328-0410-95d8-f526ca767f89
---
 bacula/kernstodo            | 7 +++----
 bacula/kes-1.37             | 2 ++
 bacula/src/lib/alist.h      | 4 ++++
 bacula/src/stored/acquire.c | 2 +-
 bacula/src/stored/protos.h  | 2 +-
 bacula/src/stored/wait.c    | 9 ++++-----
 bacula/src/version.h        | 4 ++--
 7 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/bacula/kernstodo b/bacula/kernstodo
index 333836635c..1d41801436 100644
--- a/bacula/kernstodo
+++ b/bacula/kernstodo
@@ -55,6 +55,7 @@ Document:
 - Document Heartbeat Interval in the dealing with firewalls section.
 
 For 1.37:
+- Implement "PreferMountedVolumes = yes|no" in Job resource.
 === rate design
   jcr->last_rate
   jcr->last_runtime
@@ -71,8 +72,6 @@ For 1.37:
 - Make bootstrap file handle multiple MediaTypes (SD)
 - Test restoring into a user restricted directory on Win32 -- see
   bug report.
-- Fix 3993 error in SD. It forgets to look at autochanger
-  resource for device command, ...
 - --without-openssl breaks at least on Solaris.
 - Python:
   - Make a callback when Rerun failed levels is called.
@@ -85,7 +84,6 @@ For 1.37:
   - Make sure that Python has access to Client address/port so that
     it can check if Clients are alive.
 
-- Implement "NewVolumeEachJob = yes|no" in Dir.
 - Remove all old Device resource code in Dir and code to pass it
   back in SD -- better, rework it to pass back device statistics.
 - Check locking of resources -- be sure to lock devices where previously
@@ -1285,4 +1283,5 @@ Block Position: 0
 - Require restore via the restore command or make a restore Job
   get the bootstrap file.
 - Implement Maximum Job Spool Size
-
+- Fix 3993 error in SD. It forgets to look at autochanger
+  resource for device command, ...
diff --git a/bacula/kes-1.37 b/bacula/kes-1.37
index 6dee32c40a..1caa9c3ddf 100644
--- a/bacula/kes-1.37
+++ b/bacula/kes-1.37
@@ -4,6 +4,8 @@
 General:
 
 Changes to 1.37.20:
+04Jun05
+- Minor changes
 01Jun05
 - Add more documentation to mtx-changer.in
 - Correct link to manual in authenticate.c in various
diff --git a/bacula/src/lib/alist.h b/bacula/src/lib/alist.h
index f02be3d5c0..30eefed031 100644
--- a/bacula/src/lib/alist.h
+++ b/bacula/src/lib/alist.h
@@ -77,6 +77,10 @@ public:
    int size() const;
    void destroy();
    void grow(int num);
+
+   /* Use it as a stack, pushing and poping from the end */
+   void push(void *item) { append(item); };
+   void pop() { num_items?NULL:remove(num_items-1); };
 };
 
 inline void * alist::operator [](int index) const {
diff --git a/bacula/src/stored/acquire.c b/bacula/src/stored/acquire.c
index 8f0ba237c2..31569cf193 100644
--- a/bacula/src/stored/acquire.c
+++ b/bacula/src/stored/acquire.c
@@ -329,7 +329,7 @@ DCR *acquire_device_for_append(DCR *dcr)
     * With the reservation system, this should not happen
     */
    if (dev->can_read()) {
-      Jmsg(jcr, M_FATAL, 0, _("Device %s is busy reading.\n"), dev->print_name());
+      Jmsg1(jcr, M_FATAL, 0, _("Device %s is busy reading.\n"), dev->print_name());
       goto get_out;
    }
 
diff --git a/bacula/src/stored/protos.h b/bacula/src/stored/protos.h
index 459b5208a4..c20da23fe8 100644
--- a/bacula/src/stored/protos.h
+++ b/bacula/src/stored/protos.h
@@ -226,4 +226,4 @@ void    list_spool_stats          (BSOCK *bs);
 
 /* From wait.c */
 int wait_for_sysop(DCR *dcr);
-bool wait_for_device(JCR *jcr, const char *msg, bool first);
+bool wait_for_device(JCR *jcr, bool first);
diff --git a/bacula/src/stored/wait.c b/bacula/src/stored/wait.c
index aefac5cac8..ddd4aaf832 100644
--- a/bacula/src/stored/wait.c
+++ b/bacula/src/stored/wait.c
@@ -158,7 +158,7 @@ int wait_for_sysop(DCR *dcr)
  * Returns: true  if a device has changed state
  *          false if the total wait time has expired.
  */
-bool wait_for_device(JCR *jcr, const char *msg, bool first)
+bool wait_for_device(JCR *jcr, bool first)
 {
    struct timeval tv;
    struct timezone tz;
@@ -172,7 +172,7 @@ bool wait_for_device(JCR *jcr, const char *msg, bool first)
    P(device_release_mutex);
 
    if (first) {
-      Jmsg(jcr, M_MOUNT, 0, msg);
+      Jmsg(jcr, M_MOUNT, 0, _("Job %s waiting to obtain a device.\n"), jcr->Job);
    }
 
    /*
@@ -229,7 +229,7 @@ bool wait_for_device(JCR *jcr, const char *msg, bool first)
          if (!double_jcr_wait_time(jcr)) {
             break;                 /* give up */
          }
-         Jmsg(jcr, M_MOUNT, 0, msg);
+         Jmsg(jcr, M_MOUNT, 0, _("Job %s waiting to obtain a device.\n"), jcr->Job);
       }
 
       add_wait = jcr->wait_sec - (now - start);
@@ -247,8 +247,7 @@ bool wait_for_device(JCR *jcr, const char *msg, bool first)
 }
 
 /*
- * The jcr timers are used for waiting on any device
- *
+ * The jcr timers are used for waiting on any device *
  * Returns: true if time doubled
  *          false if max time expired
  */
diff --git a/bacula/src/version.h b/bacula/src/version.h
index 2cd7f8d0ca..e15ed40847 100644
--- a/bacula/src/version.h
+++ b/bacula/src/version.h
@@ -1,8 +1,8 @@
 /* */
 #undef  VERSION
 #define VERSION "1.37.20"
-#define BDATE   "01 June 2005"
-#define LSMDATE "01Jun05"
+#define BDATE   "04 June 2005"
+#define LSMDATE "04Jun05"
 
 /* Debug flags */
 #undef  DEBUG
-- 
2.39.5