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

[bacula/bacula] / bacula / src / dird / dird_conf.h

diff --git a/bacula/src/dird/dird_conf.h b/bacula/src/dird/dird_conf.h
index ee63b8a6beb22efc50de544dcd2ebb166aa2d300..236e15cfd188141654a75ddcf9f699f1a9971147 100644 (file)
--- a/bacula/src/dird/dird_conf.h
+++ b/bacula/src/dird/dird_conf.h
@@ -6,7 +6,7 @@
  *    Version $Id$
  */
 /*
-   Copyright (C) 2000-2003 2002 Kern Sibbald and John Walker
+   Copyright (C) 2000-2004 Kern Sibbald and John Walker
 
    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License as
@@ -62,20 +62,20 @@ enum {
 
 /* Used for certain KeyWord tables */
 struct s_kw {       
-   char *name;
+   const char *name;
    int token;   
 };
 
 /* Job Level keyword structure */
 struct s_jl {
-   char *level_name;                  /* level keyword */
+   const char *level_name;                  /* level keyword */
    int  level;                        /* level */
    int  job_type;                     /* JobType permitting this level */
 };
 
 /* Job Type keyword structure */
 struct s_jt {
-   char *type_name;
+   const char *type_name;
    int job_type;
 };
 
@@ -239,13 +239,15 @@ struct JOB {
    uint32_t NumConcurrentJobs;        /* number of concurrent jobs running */
 };
 
+#undef  MAX_FOPTS
 #define MAX_FOPTS 30
 
 /* File options structure */
 struct FOPTS {
    char opts[MAX_FOPTS];              /* options string */
-   alist match;                       /* match string(s) */
-   alist base_list;                   /* list of base names */
+   alist regex;                       /* regex string(s) */
+   alist wild;                        /* wild card strings */
+   alist base;                        /* list of base names */
 };
 
 
@@ -264,12 +266,12 @@ struct INCEXE {
 struct FILESET {
    RES   hdr;
 
-   int new_include;                   /* Set if new include used */
+   bool new_include;                  /* Set if new include used */
    INCEXE **include_items;            /* array of incexe structures */
    int num_includes;                  /* number in array */
    INCEXE **exclude_items;
    int num_excludes;
-   int have_MD5;                      /* set if MD5 initialized */
+   bool have_MD5;                     /* set if MD5 initialized */
    struct MD5Context md5c;            /* MD5 of include/exclude */
    char MD5[30];                      /* base 64 representation of MD5 */
 };