build: removed unused variables reported by clang

bareos · Oct 10, 2018 · 412ee63 · 412ee63
1 parent d9dd947
commit 412ee63
Show file tree

Hide file tree

Showing 6 changed files with 2 additions and 20 deletions.
diff --git a/core/src/dird/ndmp_dma_restore_NDMP_NATIVE.cc b/core/src/dird/ndmp_dma_restore_NDMP_NATIVE.cc
@@ -52,12 +52,8 @@ static inline bool fill_restore_environment_ndmp_native(JobControlRecord *jcr,
                                             int32_t current_fi,
                                             struct ndm_job_param *job)
 {
-   int i;
-   char *bp;
    ndmp9_pval pv;
-   FilesetResource *fileset;
-   char *restore_pathname,
-        *ndmp_filesystem,
+   char *ndmp_filesystem,
         *restore_prefix;
    PoolMem tape_device;
    PoolMem destination_path;
@@ -259,9 +255,6 @@ int SetFilesToRestoreNdmpNative(JobControlRecord *jcr, struct ndm_job_param *job
  */
 static bool DoNdmpNativeRestore(JobControlRecord *jcr)
 {
-   int cnt;
-   BareosSocket *sd;
-   storagedaemon::BootStrapRecord *bsr;
    NIS *nis = NULL;
    int32_t current_fi = 0;
    struct ndm_session ndmp_sess;
@@ -270,7 +263,6 @@ static bool DoNdmpNativeRestore(JobControlRecord *jcr)
    bool retval = false;
    int NdmpLoglevel;
    char mediabuf[100];
-   ndmmedia *media;
    slot_number_t ndmp_slot;
 
    if (jcr->res.client->ndmp_loglevel > me->ndmp_loglevel) {

diff --git a/core/src/dird/ndmp_fhdb_lmdb.cc b/core/src/dird/ndmp_fhdb_lmdb.cc
@@ -533,7 +533,6 @@ static inline void CalculatePath(uint64_t node, fhdb_state *fhdb_state)
 {
    PoolMem temp;
    int result = 0;
-   MDB_cursor *cursor;
    MDB_val rkey, rdata;
    struct fhdb_payload *payload;
    bool root_node_reached = false;
@@ -578,7 +577,6 @@ static inline void ProcessLmdb(NIS *nis, struct fhdb_state *fhdb_state)
 {
    int result;
    uint64_t node;
-   char *filename;
    MDB_cursor *cursor;
    int8_t FileType = 0;
    MDB_val rkey, rdata;

diff --git a/core/src/dird/ndmp_ndmmedia_db_helpers.cc b/core/src/dird/ndmp_ndmmedia_db_helpers.cc
@@ -183,7 +183,6 @@ bool GetNdmmediaInfoFromDatabase(ndm_media_table *media_tab, JobControlRecord  *
     * Find restore JobId
     */
    JobId_t  restoreJobId;
-   int status = 0;
    char *p = jcr->JobIds;
 
   /*

diff --git a/core/src/lib/parse_conf.cc b/core/src/lib/parse_conf.cc
@@ -99,8 +99,8 @@ ConfigurationParser::ConfigurationParser()
    , resources_ (0)
    , res_head_(nullptr)
    , use_config_include_dir_ (false)
-   , ParseConfigReadyCb_(nullptr)
    , SaveResourceCb_(nullptr)
+   , ParseConfigReadyCb_(nullptr)
    , DumpResourceCb_(nullptr)
    , FreeResourceCb_(nullptr) {
    return;

diff --git a/core/src/stored/dir_cmd.cc b/core/src/stored/dir_cmd.cc
@@ -1697,7 +1697,6 @@ static bool PassiveCmd(JobControlRecord *jcr)
    BareosSocket *dir = jcr->dir_bsock;
    BareosSocket *fd;                      /* file daemon bsock */
    std::string qualified_resource_name;
-   TlsResource *tls_resource;
 
    Dmsg1(100, "PassiveClientCmd: %s", dir->msg);
    if (sscanf(dir->msg, passiveclientcmd, filed_addr, &filed_port, &enable_ssl) != 3) {

diff --git a/core/src/stored/lock.cc b/core/src/stored/lock.cc
@@ -33,12 +33,6 @@
 
 namespace storagedaemon {
 
-#ifdef SD_DEBUG_LOCK
-const int debuglevel = 0;
-#else
-const int debuglevel = 500;
-#endif
-
 /**
  * The Storage daemon has three locking concepts that must be understood:
  *