Fix plugin bug with multiple simultaneous jobs

[bacula/bacula] / bacula / src / lib / alist.h

diff --git a/bacula/src/lib/alist.h b/bacula/src/lib/alist.h
index d19bf5393c3a8fbe08b99585df24d02818398298..d2f1d06fac38c5064d179fc11e02590dc2977efb 100644 (file)
--- a/bacula/src/lib/alist.h
+++ b/bacula/src/lib/alist.h
@@ -1,12 +1,12 @@
 /*
-   Bacula® - The Network Backup Solution
+   Bacula(R) - The Network Backup Solution
 
-   Copyright (C) 2003-2008 Free Software Foundation Europe e.V.
+   Copyright (C) 2003-2012 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.
    This program is Free Software; you can redistribute it and/or
-   modify it under the terms of version two of the GNU General Public
+   modify it under the terms of version three of the GNU Affero General Public
    License as published by the Free Software Foundation and included
    in the file LICENSE.
 
@@ -15,19 +15,17 @@
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
    General Public License for more details.
 
-   You should have received a copy of the GNU General Public License
+   You should have received a copy of the GNU Affero General Public License
    along with this program; if not, write to the Free Software
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
    02110-1301, USA.
 
-   Bacula® is a registered trademark of Kern Sibbald.
+   Bacula(R) is a registered trademark of Kern Sibbald.
    The licensor of Bacula is the Free Software Foundation Europe
    (FSFE), Fiduciary Program, Sumatrastrasse 25, 8006 Zürich,
    Switzerland, email:ftf@fsfeurope.org.
 */
 /*
- *   Version $Id$
- *
  *  Kern Sibbald, June MMIII
  */
 
@@ -49,6 +47,15 @@
          (*((void **)&(var))=(void*)((list)->next())))
 #endif
 
+#ifdef HAVE_TYPEOF
+#define foreach_alist_index(inx, var, list) \
+        for(inx=0; ((var)=(typeof(var))(list)->get(inx)); inx++ )
+#else
+#define foreach_alist_index(inx, var, list) \
+    for(inx=0; ((*((void **)&(var))=(void*)((list)->get(inx)))); inx++ )
+#endif
+
+
 
 
 /* Second arg of init */
@@ -83,6 +90,7 @@ public:
    void *first();
    void *last();
    void * operator [](int index) const;
+   int current() const { return cur_item; };
    int size() const;
    void destroy();
    void grow(int num);
@@ -92,6 +100,9 @@ public:
    void *pop() { return remove(num_items-1); };
 };
 
+/*
+ * Define index operator []
+ */
 inline void * alist::operator [](int index) const {
    if (index < 0 || index >= num_items) {
       return NULL;
@@ -110,7 +121,8 @@ inline bool alist::empty() const
  *   allowing us to mix C++ classes inside malloc'ed
  *   C structures. Define before called in constructor.
  */
-inline void alist::init(int num, bool own) {
+inline void alist::init(int num, bool own)
+{
    items = NULL;
    num_items = 0;
    max_items = 0;
@@ -119,12 +131,14 @@ inline void alist::init(int num, bool own) {
 }
 
 /* Constructor */
-inline alist::alist(int num, bool own) {
+inline alist::alist(int num, bool own)
+{
    init(num, own);
 }
 
 /* Destructor */
-inline alist::~alist() {
+inline alist::~alist()
+{
    destroy();
 }