ebl Add more tests in migration time test (like for copy time test)

[bacula/bacula] / bacula / src / filed / estimate.c

diff --git a/bacula/src/filed/estimate.c b/bacula/src/filed/estimate.c
index 66a4c34dc42e5e3c40648aa27e0c787677a423b4..a4fd06d8dacbe37f5a2d4b134efd0c15ddfd84e5 100644 (file)
--- a/bacula/src/filed/estimate.c
+++ b/bacula/src/filed/estimate.c
@@ -1,23 +1,14 @@
-/*
- *  Bacula File Daemon estimate.c
- *   Make and estimate of the number of files and size to be saved.
- *
- *    Kern Sibbald, September MMI
- *
- *   Version $Id$
- *
- */
 /*
    Bacula® - The Network Backup Solution
 
-   Copyright (C) 2001-2006 Free Software Foundation Europe e.V.
+   Copyright (C) 2001-2008 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
@@ -29,16 +20,25 @@
    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.
 */
+/*
+ *  Bacula File Daemon estimate.c
+ *   Make and estimate of the number of files and size to be saved.
+ *
+ *    Kern Sibbald, September MMI
+ *
+ *   Version $Id$
+ *
+ */
 
 #include "bacula.h"
 #include "filed.h"
 
-static int tally_file(FF_PKT *ff_pkt, void *pkt, bool);
+static int tally_file(JCR *jcr, FF_PKT *ff_pkt, bool);
 
 /*
  * Find all the requested files and count them.
@@ -50,7 +50,7 @@ int make_estimate(JCR *jcr)
    set_jcr_job_status(jcr, JS_Running);
 
    set_find_options((FF_PKT *)jcr->ff, jcr->incremental, jcr->mtime);
-   stat = find_files(jcr, (FF_PKT *)jcr->ff, tally_file, (void *)jcr);
+   stat = find_files(jcr, (FF_PKT *)jcr->ff, tally_file, NULL);
 
    return stat;
 }
@@ -59,9 +59,8 @@ int make_estimate(JCR *jcr)
  * Called here by find() for each file included.
  *
  */
-static int tally_file(FF_PKT *ff_pkt, void *ijcr, bool top_level) 
+static int tally_file(JCR *jcr, FF_PKT *ff_pkt, bool top_level) 
 {
-   JCR *jcr = (JCR *)ijcr;
    ATTR attr;
 
    if (job_canceled(jcr)) {
@@ -76,6 +75,7 @@ static int tally_file(FF_PKT *ff_pkt, void *ijcr, bool top_level)
    case FT_NOFSCHG:
    case FT_INVALIDFS:
    case FT_INVALIDDT:
+   case FT_REPARSE:
    case FT_DIREND:
    case FT_SPEC:
    case FT_RAW: