Change copyright as per agreement with FSFE

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

diff --git a/bacula/src/lib/rblist.c b/bacula/src/lib/rblist.c
index 2d5477ff1aeff6cbb36e2ae118f4881be558be67..10d8a8d84158261f4fbe83780fdaaf86179211c3 100644 (file)
--- a/bacula/src/lib/rblist.c
+++ b/bacula/src/lib/rblist.c
@@ -1,29 +1,20 @@
 /*
-   Bacula® - The Network Backup Solution
-
-   Copyright (C) 2005-2011 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® 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.
+   Bacula(R) - The Network Backup Solution
+
+   Copyright (C) 2000-2016 Kern Sibbald
+
+   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.
 */
 /*
  *  Bacula red-black binary tree routines.
@@ -31,7 +22,7 @@
  *    rblist is a binary tree with the links being in the data item.
  *
  *   Developped in part from ideas obtained from several online University
- *    courses. 
+ *    courses.
  *
  *   Kern Sibbald, November MMV
  *
@@ -46,8 +37,8 @@
 /*
  *  Insert an item in the tree, but only if it is unique
  *   otherwise, the item is returned non inserted
- *  The big trick is keeping the tree balanced after the 
- *   insert. We use a parent pointer to make it simpler and 
+ *  The big trick is keeping the tree balanced after the
+ *   insert. We use a parent pointer to make it simpler and
  *   to avoid recursion.
  *
  * Returns: item         if item inserted
@@ -169,8 +160,8 @@ void *rblist::search(void *item, int compare(void *item1, void *item2))
    return found;
 }
 
-/* 
- * Get first item (i.e. lowest value) 
+/*
+ * Get first item (i.e. lowest value)
  */
 void *rblist::first(void)
 {
@@ -199,9 +190,9 @@ void *rblist::first(void)
  *  was called once before calling this routine.
  *  We always go down as far as we can to the left, then up, and
  *  down one to the right, and again down as far as we can to the
- *  left.  etc. 
+ *  left.  etc.
  *
- * Returns: pointer to next larger item 
+ * Returns: pointer to next larger item
  *          NULL when no more items in tree
  */
 void *rblist::next(void *item)
@@ -216,7 +207,7 @@ void *rblist::next(void *item)
    if ((down && !left(x) && right(x)) || (!down && right(x))) {
       /* Move down to right one */
       down = true;
-      x = right(x);                       
+      x = right(x);
       /* Then all the way down left */
       while (left(x))  {
          x = left(x);
@@ -258,7 +249,7 @@ void *rblist::any(void *item)
    if ((down && !left(x) && right(x)) || (!down && right(x))) {
       /* Move down to right one */
       down = true;
-      x = right(x);                       
+      x = right(x);
       /* Then all the way down left */
       while (left(x))  {
          x = left(x);
@@ -349,12 +340,12 @@ void rblist::destroy()
          }
       }
       if (!left(x) && !right(x)) {
-         if (head == x) {  
+         if (head == x) {
             head = NULL;
          }
 //          if (num_items<30) {
 //             printf("free nitems=%d item=%p left=%p right=%p\n", num_items, x, left(x), right(x));
-//          }   
+//          }
          free((void *)x);      /* free previous node */
          num_items--;
       }
@@ -382,7 +373,7 @@ void rblist::destroy()
 #ifdef TEST_PROGRAM
 
 struct MYJCR {
-   void link;
+   rblink link;
    char *buf;
 };
 
@@ -460,7 +451,7 @@ int main()
    if ((jcr1=(MYJCR *)jcr_chain->search((void *)jcr, my_compare))) {
       printf("Search for AAA got %s\n", jcr1->buf);
    } else {
-      printf("Search for AAA not found\n"); 
+      printf("Search for AAA not found\n");
    }
    free(jcr->buf);
 
@@ -468,7 +459,7 @@ int main()
    if ((jcr1 = (MYJCR *)jcr_chain->search((void *)jcr, my_compare))) {
       printf("Search for ZZZ got %s\n", jcr1->buf);
    } else {
-      printf("Search for ZZZ not found\n"); 
+      printf("Search for ZZZ not found\n");
    }
    free(jcr->buf);
    free(jcr);