Fix a cosmetic bug that caused spurious OpenSSL error messages; there is no reason...

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

diff --git a/bacula/src/filed/estimate.c b/bacula/src/filed/estimate.c
index 56ff5e736ccdcba724cf57d066bde2f23569ad21..ccf2e660f37a856a010e2d7a094a52a603f38d6a 100644 (file)
--- a/bacula/src/filed/estimate.c
+++ b/bacula/src/filed/estimate.c
@@ -30,7 +30,7 @@
 #include "bacula.h"
 #include "filed.h"
 
-static int tally_file(FF_PKT *ff_pkt, void *pkt);
+static int tally_file(FF_PKT *ff_pkt, void *pkt, bool);
 
 /*
  * Find all the requested files and count them.
@@ -39,7 +39,7 @@ int make_estimate(JCR *jcr)
 {
    int stat;
 
-   jcr->JobStatus = JS_Running;
+   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);
@@ -51,7 +51,7 @@ int make_estimate(JCR *jcr)
  * Called here by find() for each file included.
  *
  */
-static int tally_file(FF_PKT *ff_pkt, void *ijcr)
+static int tally_file(FF_PKT *ff_pkt, void *ijcr, bool top_level) 
 {
    JCR *jcr = (JCR *)ijcr;
    ATTR attr;
@@ -60,13 +60,14 @@ static int tally_file(FF_PKT *ff_pkt, void *ijcr)
       return 0;
    }
    switch (ff_pkt->type) {
-   case FT_LNKSAVED:                 /* Hard linked, file already saved */
+   case FT_LNKSAVED:                  /* Hard linked, file already saved */
    case FT_REGE:
    case FT_REG:
    case FT_LNK:
    case FT_NORECURSE:
    case FT_NOFSCHG:
    case FT_INVALIDFS:
+   case FT_INVALIDDT:
    case FT_DIREND:
    case FT_SPEC:
    case FT_RAW:
@@ -86,19 +87,19 @@ static int tally_file(FF_PKT *ff_pkt, void *ijcr)
 
    if (ff_pkt->type != FT_LNKSAVED && S_ISREG(ff_pkt->statp.st_mode)) {
       if (ff_pkt->statp.st_size > 0) {
-        jcr->JobBytes += ff_pkt->statp.st_size;
+         jcr->JobBytes += ff_pkt->statp.st_size;
       }
 #ifdef HAVE_DARWIN_OS
       if (ff_pkt->flags & FO_HFSPLUS) {
-        if (ff_pkt->hfsinfo.rsrclength > 0) {
-           jcr->JobBytes += ff_pkt->hfsinfo.rsrclength;
-        }
-        jcr->JobBytes += 32;    /* Finder info */
+         if (ff_pkt->hfsinfo.rsrclength > 0) {
+            jcr->JobBytes += ff_pkt->hfsinfo.rsrclength;
+         }
+         jcr->JobBytes += 32;    /* Finder info */
       }
 #endif
    }
    jcr->num_files_examined++;
-   jcr->JobFiles++;                 /* increment number of files seen */
+   jcr->JobFiles++;                  /* increment number of files seen */
    if (jcr->listing) {
       memcpy(&attr.statp, &ff_pkt->statp, sizeof(struct stat));
       attr.type = ff_pkt->type;