[Bacula-commits] bacula/src/lib dlist.c,1.16,1.17 dlist.h,1.16,1.17

[Kern S. <ke...@us...>]

Update of /cvsroot/bacula/bacula/src/lib
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv677/src/lib

Modified Files:
	dlist.c dlist.h 
Log Message:
Fix compile problem of ua_restore.c on broken compilers.

Index: dlist.h
===================================================================
RCS file: /cvsroot/bacula/bacula/src/lib/dlist.h,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- dlist.h	21 Dec 2004 16:18:39 -0000	1.16
+++ dlist.h	26 May 2005 06:13:38 -0000	1.17
@@ -1,27 +1,22 @@
 /*
  *   Version $Id$
  */
-
 /*
-   Copyright (C) 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
-   published by the Free Software Foundation; either version 2 of
-   the License, or (at your option) any later version.
+   modify it under the terms of the GNU General Public License
+   version 2 as ammended 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 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., 59 Temple Place - Suite 330, Boston,
-   MA 02111-1307, USA.
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 
+   the file LICENSE for additional details.
 
  */
 
+
 /* ========================================================================
  *
  *   Doubly linked list  -- dlist
@@ -73,7 +68,7 @@
    void binary_insert(void *item, int compare(void *item1, void *item2));
    void remove(void *item);
    bool empty() const;
-   int  size() const;
+   int	size() const;
    void *next(const void *item) const;
    void *prev(const void *item) const;
    void destroy();

Index: dlist.c
===================================================================
RCS file: /cvsroot/bacula/bacula/src/lib/dlist.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- dlist.c	21 Dec 2004 16:18:39 -0000	1.16
+++ dlist.c	26 May 2005 06:13:38 -0000	1.17
@@ -10,22 +10,17 @@
  *
  */
 /*
-   Copyright (C) 2000-2004 Kern Sibbald and John Walker
+   Copyright (C) 2000-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
-   published by the Free Software Foundation; either version 2 of
-   the License, or (at your option) any later version.
+   modify it under the terms of the GNU General Public License
+   version 2 as ammended 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 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., 59 Temple Place - Suite 330, Boston,
-   MA 02111-1307, USA.
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 
+   the file LICENSE for additional details.
 
  */
 
@@ -374,17 +369,17 @@
 	 for (int k=0; k<CNT; k++) {
 	    count++;
 	    if ((count & 0x3FF) == 0) {
-	       Dmsg1(000, "At %d\n", count);
+               Dmsg1(000, "At %d\n", count);
 	    }
 	    jcr = (MYJCR *)malloc(sizeof(MYJCR));
 	    jcr->buf = bstrdup(buf);
 	    jcr1 = (MYJCR *)jcr_chain->binary_insert(jcr, my_compare);
 	    if (jcr != jcr1) {
-	       Dmsg2(000, "Insert of %s vs %s failed.\n", jcr->buf, jcr1->buf);
+               Dmsg2(000, "Insert of %s vs %s failed.\n", jcr->buf, jcr1->buf);
 	    }
 	    buf[1]--;
 	 }
-	 buf[1] = 'Z';
+         buf[1] = 'Z';
 	 buf[2]--;
       }
       buf[2] = 'Z';