Apply fix from Martin Simmons to clear structure before

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

diff --git a/bacula/src/lib/alist.h b/bacula/src/lib/alist.h
index cf8fbf5bc552bcfbf1cbcebd9fc84ed7dcb1ed18..30eefed03153f68aa7b61760c7b784a2727d1022 100644 (file)
--- a/bacula/src/lib/alist.h
+++ b/bacula/src/lib/alist.h
@@ -3,7 +3,7 @@
  */
 
 /*
-   Copyright (C) 2003-2004 Kern Sibbald and John Walker
+   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 as
@@ -24,7 +24,7 @@
 
  */
 
-/* 
+/*
  * There is a lot of extra casting here to work around the fact
  * that some compilers (Sun and Visual C++) do not accept
  * (void *) as an lvalue on the left side of an equal.
@@ -32,10 +32,12 @@
  * Loop var through each member of list
  */
 #define foreach_alist(var, list) \
-    for((*((void **)&(var))=(void*)((list)->first())); (var); (*((void **)&(var))=(void*)((list)->next())))
+    for((*((void **)&(var))=(void*)((list)->first())); \
+         (var); \
+         (*((void **)&(var))=(void*)((list)->next())))
 
 #ifdef the_easy_way
-#define foreach_dlist(var, list) \
+#define foreach_alist(var, list) \
         for((void*(var))=(list)->first(); (var); (void *(var))=(list)->next(var)); )
 #endif
 
@@ -46,11 +48,11 @@ enum {
   not_owned_by_alist = false
 };
 
-/* 
+/*
  * Array list -- much like a simplified STL vector
  *   array of pointers to inserted items
  */
-class alist {
+class alist : public SMARTALLOC {
    void **items;
    int num_items;
    int max_items;
@@ -60,22 +62,25 @@ class alist {
    void grow_list(void);
 public:
    alist(int num = 1, bool own=true);
+   ~alist();
    void init(int num = 1, bool own=true);
    void append(void *item);
    void prepend(void *item);
    void *remove(int index);
    void *get(int index);
-   bool empty();
+   bool empty() const;
    void *prev();
    void *next();
    void *first();
    void *last();
    void * operator [](int index) const;
-   int size();
+   int size() const;
    void destroy();
    void grow(int num);
-   void * operator new(size_t);
-   void operator delete(void *);
+
+   /* 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 {
@@ -85,12 +90,13 @@ inline void * alist::operator [](int index) const {
    return items[index];
 }
 
-inline bool alist::empty()
+inline bool alist::empty() const
 {
-   return num_items == 0;
+   /* Check for null pointer */
+   return this ? num_items == 0 : true;
 }
 
-/*                            
+/*
  * This allows us to do explicit initialization,
  *   allowing us to mix C++ classes inside malloc'ed
  *   C structures. Define before called in constructor.
@@ -105,30 +111,29 @@ inline void alist::init(int num, bool own) {
 
 /* Constructor */
 inline alist::alist(int num, bool own) {
-   this->init(num, own);
+   init(num, own);
+}
+
+/* Destructor */
+inline alist::~alist() {
+   destroy();
 }
-   
+
 
 
 /* Current size of list */
-inline int alist::size()
+inline int alist::size() const
 {
-   return num_items;
+   /*
+    * Check for null pointer, which allows test
+    *  on size to succeed even if nothing put in
+    *  alist.
+    */
+   return this ? num_items : 0;
 }
 
 /* How much to grow by each time */
-inline void alist::grow(int num) 
+inline void alist::grow(int num)
 {
    num_grow = num;
 }
-
-inline void * alist::operator new(size_t)
-{
-   return malloc(sizeof(alist));
-}
-
-inline void alist::operator delete(void  *item)
-{
-   ((alist *)item)->destroy();
-   free(item);
-}