From: Kern Sibbald <kern@sibbald.com>
Date: Sun, 1 Jun 2014 12:32:50 +0000 (+0200)
Subject: Fix compiler warning + simplify some #ifdefs
X-Git-Tag: Release-7.0.4~3
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=410a205e489d576238fce8d4d8e30c31f18f5591;p=bacula%2Fbacula

Fix compiler warning + simplify some #ifdefs
---

diff --git a/bacula/src/filed/job.c b/bacula/src/filed/job.c
index cbb95d2ba0..207f02c68f 100644
--- a/bacula/src/filed/job.c
+++ b/bacula/src/filed/job.c
@@ -23,10 +23,15 @@
 #include "bacula.h"
 #include "filed.h"
 #include "ch.h"
+#ifdef WIN32_VSS
+#include "vss.h"
+static pthread_mutex_t vss_mutex = PTHREAD_MUTEX_INITIALIZER;
+#endif
 
 /* Globals */
 bool win32decomp = false;
 bool no_win32_write_errors = false;
+static int enable_vss = 0;
 static pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER;
 
 /*
@@ -1628,6 +1633,10 @@ static int fileset_cmd(JCR *jcr)
    POOL_MEM buf(PM_MESSAGE);
    BSOCK *dir = jcr->dir_bsock;
    int rtnstat;
+   int vss = 0;
+
+   sscanf(dir->msg, "fileset vss=%d", &vss);
+   enable_vss = vss;
 
    if (!init_fileset(jcr)) {
       return 0;