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 c4727e8ab54b6d572e17defb891c63b2fce4c21e..d2f1d06fac38c5064d179fc11e02590dc2977efb 100644 (file)
--- a/bacula/src/lib/alist.h
+++ b/bacula/src/lib/alist.h
@@ -1,21 +1,32 @@
 /*
- *   Version $Id$
- *
- *  Kern Sibbald, June MMIII
- */
+   Bacula(R) - The Network Backup Solution
+
+   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 three of the GNU Affero General Public
+   License as published by the Free Software Foundation and included
+   in the file LICENSE.
+
+   This program is distributed in the hope that it will be useful, but
+   WITHOUT ANY WARRANTY; without even the implied warranty of
+   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 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(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.
+*/
 /*
-   Copyright (C) 2003-2005 Kern Sibbald
-
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License
-   version 2 as amended with additional clauses defined in the
-   file LICENSE in the main source directory.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 
-   the file LICENSE for additional details.
-
+ *  Kern Sibbald, June MMIII
  */
 
 
@@ -26,17 +37,27 @@
  *
  * Loop var through each member of list
  */
+#ifdef HAVE_TYPEOF
+#define foreach_alist(var, list) \
+        for((var)=(typeof(var))(list)->first(); (var); (var)=(typeof(var))(list)->next() )
+#else
 #define foreach_alist(var, list) \
     for((*((void **)&(var))=(void*)((list)->first())); \
          (var); \
          (*((void **)&(var))=(void*)((list)->next())))
+#endif
 
-#ifdef the_easy_way
-#define foreach_alist(var, list) \
-        for(((void*)(var))=(list)->first(); (var); ((void*)(var))=(list)->next(var)); )
+#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 */
 enum {
   owned_by_alist = true,
@@ -69,15 +90,19 @@ 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);
 
    /* 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); };
+   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;
@@ -96,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;
@@ -105,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();
 }