Fix compiler warnings when not using dynamic backend loading.

bareos · Jul 24, 2014 · 14dea19 · 14dea19
1 parent 77617a8
commit 14dea19
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 5 deletions.
diff --git a/src/dird/dbcheck.c b/src/dird/dbcheck.c
@@ -61,7 +61,9 @@ static NAME_LIST name_list;
 static char buf[20000];
 static bool quit = false;
 static const char *idx_tmp_name;
+#if defined(HAVE_DYNAMIC_CATS_BACKENDS)
 static const char *backend_directory = _PATH_BAREOS_BACKENDDIR;
+#endif
 
 DIRRES *me = NULL;                    /* Our Global resource */
 CONFIG *my_config = NULL;             /* Our Global config */
@@ -126,7 +128,9 @@ int main (int argc, char *argv[])
    char *configfile = NULL;
    char *catalogname = NULL;
    char *endptr;
-   alist* backend_directories = NULL;
+#if defined(HAVE_DYNAMIC_CATS_BACKENDS)
+   alist *backend_directories = NULL;
+#endif
 
    setlocale(LC_ALL, "");
    bindtextdomain("bareos", LOCALEDIR);

diff --git a/src/stored/bscan.c b/src/stored/bscan.c
@@ -141,7 +141,9 @@ int main (int argc, char *argv[])
    char *VolumeName = NULL;
    char *DirectorName = NULL;
    DIRRES *director = NULL;
-   alist* backend_directories = NULL;
+#if defined(HAVE_DYNAMIC_CATS_BACKENDS)
+   alist *backend_directories = NULL;
+#endif
 
    setlocale(LC_ALL, "");
    bindtextdomain("bareos", LOCALEDIR);
@@ -321,7 +323,7 @@ int main (int argc, char *argv[])
    backend_directories = New(alist(10, owned_by_alist));
    backend_directories->append((char *)backend_directory);
 
-   db_set_backend_dirs( backend_directories );
+   db_set_backend_dirs(backend_directories);
 #endif
 
    if ((db = db_init_database(NULL, db_driver, db_name, db_user, db_password, db_host, db_port, NULL)) == NULL) {

diff --git a/src/tests/bbatch.c b/src/tests/bbatch.c
@@ -104,7 +104,9 @@ static int list_handler(void *ctx, int num_fields, char **row)
 int main (int argc, char *argv[])
 {
    int ch;
-   alist* backend_directories = NULL;
+#if defined(HAVE_DYNAMIC_CATS_BACKENDS)
+   alist *backend_directories = NULL;
+#endif
    bool disable_batch = false;
    char *restore_list=NULL;
    setlocale(LC_ALL, "");

diff --git a/src/tests/bvfs_test.c b/src/tests/bvfs_test.c
@@ -108,7 +108,9 @@ static int result_handler(void *ctx, int fields, char **row)
 int main (int argc, char *argv[])
 {
    int ch;
-   alist* backend_directories = NULL;
+#if defined(HAVE_DYNAMIC_CATS_BACKENDS)
+   alist *backend_directories = NULL;
+#endif
    char *jobids = (char *)"1";
    char *path=NULL, *client=NULL;
    uint64_t limit=0;