Fix compile problem of ua_restore.c on broken compilers.

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@2086 91ce42f0-d328-0410-95d8-f526ca767f89

diff --git a/bacula/kes-1.37 b/bacula/kes-1.37
index 655b9c40f5940f916c06a0b200a9cace15d561b4..cdd7c45155d3d6f3ce3e3e05d5fa0d489a820882 100644 (file)
--- a/bacula/kes-1.37
+++ b/bacula/kes-1.37
@@ -4,6 +4,8 @@
 General:
 
 Changes to 1.37.19:
+26May05
+- Fix compile problem of ua_restore.c on broken compilers.
 25May05
 - Put Dmsg() on inside if() to avoid calling subroutine.
 - Make restore.bsr have unique name.

diff --git a/bacula/src/dird/ua_restore.c b/bacula/src/dird/ua_restore.c
index 2615ad2d2e53f259bae76fe279c2aa6d0672c361..23a02883cfda9f10f803074d48c54416c0971674 100644 (file)
--- a/bacula/src/dird/ua_restore.c
+++ b/bacula/src/dird/ua_restore.c
@@ -117,6 +117,7 @@ int restore_cmd(UAContext *ua, const char *cmd)
    RESTORE_CTX rx;                   /* restore context */
    JOB *job;
    int i;
+   POOLMEM *fname;
 
    memset(&rx, 0, sizeof(rx));
    rx.path = get_pool_memory(PM_FNAME);
@@ -203,7 +204,7 @@ int restore_cmd(UAContext *ua, const char *cmd)
    }
 
    /* Build run command */
-   POOLMEM *fname = get_pool_memory(PM_MESSAGE);
+   fname = get_pool_memory(PM_MESSAGE);
    make_unique_restore_filename(ua, &fname);
    if (rx.where) {
       Mmsg(ua->cmd,

diff --git a/bacula/src/lib/dlist.c b/bacula/src/lib/dlist.c
index fab9cc404c0ba99afc191c3784cfe758f6e07de4..2c71698431b805f318fca51a795996c4990b018b 100644 (file)
--- a/bacula/src/lib/dlist.c
+++ b/bacula/src/lib/dlist.c
@@ -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 @@ int main()
         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';

diff --git a/bacula/src/lib/dlist.h b/bacula/src/lib/dlist.h
index d0071f589cc31b271ecd53201f8cd653e9593ad8..09eccfbb68b0d683e696f32f45bede899c563d0b 100644 (file)
--- a/bacula/src/lib/dlist.h
+++ b/bacula/src/lib/dlist.h
@@ -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 @@ public:
    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();

diff --git a/bacula/src/version.h b/bacula/src/version.h
index 2a44ebcd6919bb535c13b9203ca9e71f5573d51f..5621dae6b1f334bb143f46f366c7a4ffe3178e18 100644 (file)
--- a/bacula/src/version.h
+++ b/bacula/src/version.h
@@ -1,8 +1,8 @@
 /* */
 #undef  VERSION
 #define VERSION "1.37.19"
-#define BDATE   "25 May 2005"
-#define LSMDATE "25May05"
+#define BDATE   "26 May 2005"
+#define LSMDATE "26May05"
 
 /* Debug flags */
 #undef  DEBUG