kes Apply Marco van Wieringen's set of patches, cleans up Migration/Copy

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

diff --git a/bacula/src/lib/rblist.h b/bacula/src/lib/rblist.h
index 39d19bc00888c02df3978e948a6aa90ee8eefcc6..b44b64e313a7cc59c0afb5802631bd47be9024d1 100644 (file)
--- a/bacula/src/lib/rblist.h
+++ b/bacula/src/lib/rblist.h
@@ -1,14 +1,14 @@
 /*
    Bacula® - The Network Backup Solution
 
-   Copyright (C) 2005-20076 Free Software Foundation Europe e.V.
+   Copyright (C) 2005-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 plus additions
-   that are listed in the file LICENSE.
+   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
@@ -20,7 +20,7 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
    02110-1301, USA.
 
-   Bacula® is a registered trademark of John Walker.
+   Bacula® 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.
@@ -93,15 +93,6 @@ public:
    void destroy(void);
 };
 
-inline rblist::rblist(void *item, rblink *link)
-{
-   init(item, link);
-}
-
-/* Constructor with link at head of item */
-inline rblist::rblist(void): head(0), loffset(0), num_items(0)
-{
-}
 
 /*
  * This allows us to do explicit initialization,
@@ -118,6 +109,16 @@ inline void rblist::init(void *item, rblink *link)
    num_items = 0;
 }
 
+inline rblist::rblist(void *item, rblink *link)
+{
+   init(item, link);
+}
+
+/* Constructor with link at head of item */
+inline rblist::rblist(void): head(0), loffset(0), num_items(0)
+{
+}
+
 inline void rblist::set_parent(void *item, void *parent)
 {
    ((rblink *)(((char *)item)+loffset))->parent = parent;