Transplant some code from parse_conf.c to res.c

bareos · Feb 17, 2015 · 6d4e8c8 · 6d4e8c8
1 parent e603344
commit 6d4e8c8
Show file tree

Hide file tree

Showing 5 changed files with 1,141 additions and 1,146 deletions.
diff --git a/src/dird/dird_conf.c b/src/dird/dird_conf.c
@@ -2876,7 +2876,6 @@ static void parse_config_cb(LEX *lc, RES_ITEM *item, int index, int pass)
  */
 static void print_config_cb(RES_ITEM *items, int i, POOL_MEM &cfg_str)
 {
-   bool print_item = false;
    POOL_MEM temp;
 
    switch (items[i].type) {
@@ -3004,7 +3003,7 @@ static void print_config_cb(RES_ITEM *items, int i, POOL_MEM &cfg_str)
       break;
    }
    case CFG_TYPE_LEVEL: {
-      int32_t level = *(items[i].i32value);
+      uint32_t level = *(items[i].ui32value);
 
       if (level) {
          for (int32_t j = 0; joblevels[j].level_name; j++) {

diff --git a/src/dird/dird_conf.h b/src/dird/dird_conf.h
@@ -100,8 +100,8 @@ enum {
  */
 struct s_jl {
    const char *level_name;                 /* level keyword */
-   int32_t  level;                         /* level */
-   int32_t  job_type;                      /* JobType permitting this level */
+   uint32_t level;                         /* level */
+   int32_t job_type;                       /* JobType permitting this level */
 };
 
 /*