Fix compilation warning

diff --git a/bacula/src/filed/status.c b/bacula/src/filed/status.c
index b28b060daecd44bde24f06f4993653e65bfec730..f94932ce4c1128f5b0b524b16b9a46634e8a6218 100644 (file)
--- a/bacula/src/filed/status.c
+++ b/bacula/src/filed/status.c
@@ -25,6 +25,9 @@
 
 #include "bacula.h"
 #include "filed.h"
+
+#define USE_LIST_TERMINATED_JOBS
+#define USE_LIST_RESOURCE_LIMITS
 #include "lib/status.h"
 
 extern bool GetWindowsVersionString(char *buf, int maxsiz);

diff --git a/bacula/src/lib/bpipe.c b/bacula/src/lib/bpipe.c
index 136ca5b7517b9de93c0a5183c8f357315aa8ced2..4840111bef4888a5aaa8f2575e82929121825d52 100644 (file)
--- a/bacula/src/lib/bpipe.c
+++ b/bacula/src/lib/bpipe.c
@@ -167,6 +167,9 @@ BPIPE *open_bpipe(char *prog, int wait, const char *mode, char *envp[])
     * to determine the FD list to close.
     */
 #if !defined(HAVE_FCNTL_F_CLOSEM) && !defined(HAVE_CLOSEFROM)
+   struct rlimit rl;
+   int64_t rlimitResult=0;
+
    if (getrlimit(RLIMIT_NOFILE, &rl) == -1) {
       rlimitResult = sysconf(_SC_OPEN_MAX);
    } else {

diff --git a/bacula/src/lib/status.h b/bacula/src/lib/status.h
index 2582ed524e32646d2608ddce22b2cb4c1f1db235..9c04390d064daf8430da36343ca1c05054c60875 100644 (file)
--- a/bacula/src/lib/status.h
+++ b/bacula/src/lib/status.h
@@ -57,6 +57,7 @@ static void sendit(const char *msg, int len, STATUS_PKT *sp)
 }
 
 /* common to SD/FD */
+#ifdef USE_LIST_TERMINATED_JOBS
 static void list_terminated_jobs(STATUS_PKT *sp)
 {
    OutputWriter ow(sp->api_opts);
@@ -196,8 +197,10 @@ static void list_terminated_jobs(STATUS_PKT *sp)
       sendit(p, strlen(p), sp);
    }
 }
+#endif /* USE_LIST_TERMINATED_JOBS */
 
 /* common to SD/FD/DIR */
+#ifdef USE_LIST_RESOURCE_LIMITS
 static void list_resource_limits(STATUS_PKT *sp, int64_t l_nofile, int64_t l_memlock)
 {
 #ifdef HAVE_GETRLIMIT
@@ -263,6 +266,7 @@ static void list_resource_limits(STATUS_PKT *sp, int64_t l_nofile, int64_t l_mem
    }
 #endif
 }
+#endif /* USE_LIST_RESOURCE_LIMITS */
 
 #if defined(HAVE_WIN32)
 int bacstat = 0;

diff --git a/bacula/src/lib/store_mngr_cmds.h b/bacula/src/lib/store_mngr_cmds.h
index 083a35c31a9b3db7b99c97072ef47dce4273da22..3a044294f359ea3c11de1386f5c5537f7b2ece5c 100644 (file)
--- a/bacula/src/lib/store_mngr_cmds.h
+++ b/bacula/src/lib/store_mngr_cmds.h
@@ -26,7 +26,10 @@
 static const char store_query[] = "store_mngr query\n";
 static const char store_query_freespace[] = "store_mngr freespace device=%s\n";
 static char OK_store_query[] = "3000 OK query store\n";
-static char store_query_unsupp_policy[] = "3200 unsupported policy\n";
 static char OK_store_size[]   = "3000 OK size=%llu\n";
 
+#ifdef STORAGE_DAEMON
+static char store_query_unsupp_policy[] = "3200 unsupported policy\n";
+#endif
+
 #endif // STORE_MNGR_CMDS_H

diff --git a/bacula/src/stored/status.c b/bacula/src/stored/status.c
index 712fa0dd193165cc8e8b1b08044c03b885fa456b..c408b27c1744b23e885c7bba3f8a58d8bbfc6956 100644 (file)
--- a/bacula/src/stored/status.c
+++ b/bacula/src/stored/status.c
@@ -26,6 +26,9 @@
 
 #include "bacula.h"
 #include "stored.h"
+
+#define USE_LIST_TERMINATED_JOBS
+#define USE_LIST_RESOURCE_LIMITS
 #include "lib/status.h"
 #include "sd_plugins.h"