Backport from Bacula Enterprise

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

diff --git a/bacula/src/lib/dlist.h b/bacula/src/lib/dlist.h
index 9fceb99cd581f4ee49f36c96adfdb45f5b0a4cca..b5d7e0696fa467a48bce3fc3b6c5501845250e9d 100644 (file)
--- a/bacula/src/lib/dlist.h
+++ b/bacula/src/lib/dlist.h
@@ -1,41 +1,32 @@
 /*
-   Bacula® - The Network Backup Solution
-
-   Copyright (C) 2004-2007 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
-   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 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 John Walker.
-   The licensor of Bacula is the Free Software Foundation Europe
-   (FSFE), Fiduciary Program, Sumatrastrasse 25, 8006 Zürich,
-   Switzerland, email:ftf@fsfeurope.org.
+   Bacula(R) - The Network Backup Solution
+
+   Copyright (C) 2000-2015 Kern Sibbald
+   Copyright (C) 2004-2014 Free Software Foundation Europe e.V.
+
+   The original author of Bacula is Kern Sibbald, with contributions
+   from many others, a complete list can be found in the file AUTHORS.
+
+   You may use this file and others of this release according to the
+   license defined in the LICENSE file, which includes the Affero General
+   Public License, v3.0 ("AGPLv3") and some additional permissions and
+   terms pursuant to its AGPLv3 Section 7.
+
+   This notice must be preserved when any source code is 
+   conveyed and/or propagated.
+
+   Bacula(R) is a registered trademark of Kern Sibbald.
 */
 /*
  *  Written by Kern Sibbald MMIV
  *
- *   Version $Id$
  */
 
 
 /* ========================================================================
  *
  *   Doubly linked list  -- dlist
- * 
+ *
  *   See the end of the file for the dlistString class which
  *     facilitates storing strings in a dlist.
  *
@@ -93,7 +84,7 @@ public:
    void remove(void *item);
    bool empty() const;
    int  size() const;
-   void *next(void *item);      
+   void *next(void *item);
    void *prev(void *item);
    void destroy();
    void *first() const;
@@ -193,7 +184,7 @@ inline void * dlist::last() const
 }
 
 /*
- * C string helper routines for dlist   
+ * C string helper routines for dlist
  *   The string (char *) is kept in the node
  *
  *   Kern Sibbald, February 2007
@@ -201,12 +192,13 @@ inline void * dlist::last() const
  */
 class dlistString
 {
-public:   
+public:
    char *c_str() { return m_str; };
+   dlink get_link() { return m_link; }; /* eliminate clang compiler warning */
 
 private:
    dlink m_link;
-   char m_str[1];                                
+   char m_str[1];
    /* !!! Don't put anything after this as this space is used
     *     to hold the string in inline
     */