Add heap stats to Dir and SD -- eliminate #ifdefs

[bacula/bacula] / bacula / src / dird / verify.c

diff --git a/bacula/src/dird/verify.c b/bacula/src/dird/verify.c
index a82efb4d795776a89358427181e9ee88fd6fe084..e6ec1ac98682329e9b8edec3562450d4c92c052c 100644 (file)
--- a/bacula/src/dird/verify.c
+++ b/bacula/src/dird/verify.c
@@ -64,7 +64,7 @@ static int missing_handler(void *ctx, int num_fields, char **row);
  */
 int do_verify(JCR *jcr) 
 {
-   char *level, *Name;
+   const char *level, *Name;
    BSOCK   *fd;
    JOB_DBR jr, verify_jr;
    JobId_t verify_jobid = 0;
@@ -114,9 +114,6 @@ int do_verify(JCR *jcr)
       Dmsg1(100, "Last full jobid=%d\n", verify_jobid);
    } 
 
-   jcr->jr.JobId = jcr->JobId;
-   jcr->jr.StartTime = jcr->start_time;
-   jcr->jr.Level = jcr->JobLevel;
    if (!db_update_job_start_record(jcr, jcr->db, &jcr->jr)) {
       Jmsg(jcr, M_FATAL, 0, "%s", db_strerror(jcr->db));
       goto bail_out;
@@ -127,8 +124,8 @@ int do_verify(JCR *jcr)
    }
 
    /* Print Job Start message */
-   Jmsg(jcr, M_INFO, 0, _("Start Verify JobId %d Job=%s\n"),
-      jcr->JobId, jcr->Job);
+   Jmsg(jcr, M_INFO, 0, _("Start Verify JobId=%d Level=%s Job=%s\n"),
+      jcr->JobId, level_to_str(jcr->JobLevel), jcr->Job);
 
    /*
     * Now get the job record for the previous backup that interests
@@ -290,7 +287,8 @@ int do_verify(JCR *jcr)
       level="disk_to_catalog";
       break;
    default:
-      Jmsg1(jcr, M_FATAL, 0, _("Unimplemented save level %d\n"), jcr->JobLevel);
+      Jmsg2(jcr, M_FATAL, 0, _("Unimplemented save level %d(%c)\n"), jcr->JobLevel,
+        jcr->JobLevel);
       goto bail_out;
    }
 
@@ -363,10 +361,10 @@ static void verify_cleanup(JCR *jcr, int TermCode)
    char sdt[50], edt[50];
    char ec1[30];
    char term_code[100], fd_term_msg[100], sd_term_msg[100];
-   char *term_msg;
+   const char *term_msg;
    int msg_type;
    JobId_t JobId;
-   char *Name;
+   const char *Name;
 
 // Dmsg1(100, "Enter verify_cleanup() TermCod=%d\n", TermCode);
 
@@ -548,7 +546,7 @@ int get_attributes_and_compare_to_catalog(JCR *jcr, JobId_t JobId)
         jcr->FileIndex = file_index;    /* remember attribute file_index */
         decode_stat(attr, &statf, &LinkFIf);  /* decode file stat packet */
         do_SIG = NO_SIG;
-        jcr->fn_printed = FALSE;
+        jcr->fn_printed = false;
         pm_strcpy(&jcr->fname, fname);  /* move filename into JCR */
 
          Dmsg2(040, "dird<filed: stream=%d %s\n", stream, jcr->fname);
@@ -717,7 +715,7 @@ int get_attributes_and_compare_to_catalog(JCR *jcr, JobId_t JobId)
    /* Now find all the files that are missing -- i.e. all files in
     *  the database where the MarkedId != current JobId
     */
-   jcr->fn_printed = FALSE;
+   jcr->fn_printed = false;
    sprintf(buf, 
 "SELECT Path.Path,Filename.Name FROM File,Path,Filename "
 "WHERE File.JobId=%d "
@@ -752,7 +750,7 @@ static int missing_handler(void *ctx, int num_fields, char **row)
    if (!jcr->fn_printed) {
       Jmsg(jcr, M_INFO, 0, "\n");
       Jmsg(jcr, M_INFO, 0, _("The following files are missing:\n"));
-      jcr->fn_printed = TRUE;
+      jcr->fn_printed = true;
    }
    Jmsg(jcr, M_INFO, 0, "      %s%s\n", row[0]?row[0]:"", row[1]?row[1]:"");
    return 0;