From c7a41dca20c4db4da2f06dd5d03011e2c2ab185c Mon Sep 17 00:00:00 2001 From: Kern Sibbald Date: Mon, 29 Jun 2020 14:46:56 +0200 Subject: [PATCH] Eliminate compiler errors when smartalloc is turned off --- bacula/src/dird/dird_conf.h | 8 ++++---- bacula/src/lib/smartall.h | 11 +++++------ bacula/src/stored/cloud_transfer_mgr.h | 4 ++-- 3 files changed, 11 insertions(+), 12 deletions(-) diff --git a/bacula/src/dird/dird_conf.h b/bacula/src/dird/dird_conf.h index ceb2ec4b0..426010d36 100644 --- 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 b524610cb..f0735bc05 100644 --- 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 cd30d0cab..140318b6a 100644 --- 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; -- 2.47.3