Eliminate compiler errors when smartalloc is turned off

diff --git a/bacula/src/dird/dird_conf.h b/bacula/src/dird/dird_conf.h
index ceb2ec4b0a2cb7994601dd9712db8be8987a5824..426010d3615e063e3d35f3ea2901cff2b92174bd 100644 (file)
--- a/bacula/src/dird/dird_conf.h
+++ b/bacula/src/dird/dird_conf.h
@@ -251,7 +251,7 @@ inline char *CAT::name() const { return hdr.name; }
 class CLIENT_GLOBALS {
 public:
    dlink link;                        /* double link */
-   const char *name;                  /* resource name */
+   char *name;                        /* resource name */
    int32_t NumConcurrentJobs;         /* number of concurrent jobs running */
    char *SetIPaddress;                /* address from SetIP command */
    int enabled;                       /* -1: not set, 0 disabled, 1 enabled */
@@ -306,7 +306,7 @@ inline char *CLIENT::name() const { return hdr.name; }
 class STORE_GLOBALS {
 public:
    dlink link;                        /* double link */
-   const char *name;                  /* resource name */
+   char *name;                        /* resource name */
    int32_t NumConcurrentJobs;         /* number of concurrent jobs running */
    int32_t NumConcurrentReadJobs;     /* number of concurrent read jobs running */
    int enabled;                       /* -1: not set, 0: disabled, 1: enabled */
@@ -406,7 +406,7 @@ inline void USTORE::set_source(const char *where)
 class JOB_GLOBALS {
 public:
    dlink link;                        /* double link */
-   const char *name;                  /* resource name */
+   char *name;                        /* resource name */
    int32_t NumConcurrentJobs;         /* number of concurrent jobs running */
    int enabled;                       /* -1: disabled, 0: disabled, 1: Enabled */
 };
@@ -608,7 +608,7 @@ inline char *FILESET::name() const { return hdr.name; }
 class SCHED_GLOBALS {
 public:
    dlink link;                        /* double link */
-   const char *name;                  /* resource name */
+   char *name;                        /* resource name */
    int enabled;                       /* -1: not set, 0: disabled, 1: Enabled */
 };
 

diff --git a/bacula/src/lib/smartall.h b/bacula/src/lib/smartall.h
index b524610cbbec20d60ba7e5963cd2b90c4dd00cb9..f0735bc0575a31629cd35827204b3db993bcb4e0 100644 (file)
--- a/bacula/src/lib/smartall.h
+++ b/bacula/src/lib/smartall.h
@@ -1,7 +1,7 @@
 /*
    Bacula(R) - The Network Backup Solution
 
-   Copyright (C) 2000-2017 Kern Sibbald
+   Copyright (C) 2000-2020 Kern Sibbald
 
    The original author of Bacula is Kern Sibbald, with contributions
    from many others, a complete list can be found in the file AUTHORS.
@@ -30,14 +30,13 @@ extern uint64_t DLL_IMP_EXP sm_bytes;
 extern uint32_t DLL_IMP_EXP sm_max_buffers;
 extern uint32_t DLL_IMP_EXP sm_buffers;
 
+/* Avoid aggressive GCC optimization */
+extern void *bmemset(void *s, int c, size_t n);
+
 #ifdef  SMARTALLOC
 #undef  SMARTALLOC
 #define SMARTALLOC SMARTALLOC
 
-
-/* Avoid aggressive GCC optimization */
-extern void *bmemset(void *s, int c, size_t n);
-
 extern void *sm_malloc(const char *fname, int lineno, unsigned int nbytes),
             *sm_calloc(const char *fname, int lineno,
                 unsigned int nelem, unsigned int elsize),
@@ -84,7 +83,7 @@ inline void sm_dump(int x, int y=0) {} /* with default arguments, we can't use a
 #define sm_new_owner(a, b, c)
 #define sm_get_owner(a,b)
 #define sm_malloc(f, l, n)     malloc(n)
-#define sm_free(f, l, n)       free(n)
+#define sm_free(f, l, n)       free((void *)n)
 #define sm_check(f, l, fl)
 #define sm_check_rtn(f, l, fl) 1
 

diff --git a/bacula/src/stored/cloud_transfer_mgr.h b/bacula/src/stored/cloud_transfer_mgr.h
index cd30d0cabfa08085d8180a75f6551bca60c95e0f..140318b6a9ef68860923b8d703f460a47177da3c 100644 (file)
--- a/bacula/src/stored/cloud_transfer_mgr.h
+++ b/bacula/src/stored/cloud_transfer_mgr.h
@@ -100,8 +100,8 @@ public:
    transfer_engine     *m_funct;
 
    /* variables */
-   const char          *m_cache_fname;
-   const char          *m_volume_name;
+   char                *m_cache_fname;
+   char                *m_volume_name;
    uint32_t             m_part;
    cloud_driver        *m_driver;
    DCR                 *m_dcr;