Reduce compiler warnings on Windows build

diff --git a/bacula/src/baconfig.h b/bacula/src/baconfig.h
index 3bf4b523427cb5b99600ae87357494820b03033f..5d3036a942687c72d5fb01008269eb5acfd8b1a9 100644 (file)
--- a/bacula/src/baconfig.h
+++ b/bacula/src/baconfig.h
@@ -83,6 +83,9 @@
 #define WIN32_REPARSE_POINT 1
 #define WIN32_MOUNT_POINT   2
 
+/* Reduce compiler warnings from Windows vss code */
+#define uuid(x)
+
 void InitWinAPIWrapper();
 
 #define  OSDependentInit()    InitWinAPIWrapper()

diff --git a/bacula/src/lib/alist.c b/bacula/src/lib/alist.c
index 7b53dfe8bc0a0c5b206c787ca4f6c2538a2b58c8..71befece8d7dab8005e57b877010508be11f6217 100644 (file)
--- a/bacula/src/lib/alist.c
+++ b/bacula/src/lib/alist.c
@@ -1,7 +1,7 @@
 /*
    Bacula® - The Network Backup Solution
 
-   Copyright (C) 2003-2008 Free Software Foundation Europe e.V.
+   Copyright (C) 2003-2010 Free Software Foundation Europe e.V.
 
    The main author of Bacula is Kern Sibbald, with contributions from
    many others, a complete list can be found in the file AUTHORS.
@@ -34,8 +34,6 @@
  *
  *   Kern Sibbald, June MMIII
  *
- *   Version $Id$
- *
  */
 
 #include "bacula.h"

diff --git a/bacula/src/lib/alist.h b/bacula/src/lib/alist.h
index d19bf5393c3a8fbe08b99585df24d02818398298..73154c437ccb59c4ab23a87f6232d17c999716c3 100644 (file)
--- a/bacula/src/lib/alist.h
+++ b/bacula/src/lib/alist.h
@@ -1,7 +1,7 @@
 /*
    Bacula® - The Network Backup Solution
 
-   Copyright (C) 2003-2008 Free Software Foundation Europe e.V.
+   Copyright (C) 2003-2010 Free Software Foundation Europe e.V.
 
    The main author of Bacula is Kern Sibbald, with contributions from
    many others, a complete list can be found in the file AUTHORS.
@@ -26,8 +26,6 @@
    Switzerland, email:ftf@fsfeurope.org.
 */
 /*
- *   Version $Id$
- *
  *  Kern Sibbald, June MMIII
  */
 

diff --git a/bacula/src/win32/compat/compat.cpp b/bacula/src/win32/compat/compat.cpp
index e36763584cfa4d51e962606fd9c46323526345d7..3c8811051da3c51383ff38aa4defaad196ee3120 100644 (file)
--- a/bacula/src/win32/compat/compat.cpp
+++ b/bacula/src/win32/compat/compat.cpp
@@ -45,11 +45,12 @@
 
 #define MAX_PATHLENGTH  1024
 
-/* UTF-8 to UCS2 path conversion is expensive,
+/**
+   UTF-8 to UCS2 path conversion is expensive,
    so we cache the conversion. During backup the
    conversion is called 3 times (lstat, attribs, open),
-   by using the cache this is reduced to 1 time */
-
+   by using the cache this is reduced to 1 time
+ */
 static POOLMEM *g_pWin32ConvUTF8Cache = NULL;
 static POOLMEM *g_pWin32ConvUCS2Cache = NULL;
 static DWORD g_dwWin32ConvUTF8strlen = 0;
@@ -161,8 +162,9 @@ static void conv_unix_to_vss_win32_path(const char *name, char *win32_name, DWOR
         }
         name++;
     }
-    /** Strip any trailing slash, if we stored something */
-    /** but leave "c:\" with backslash (root directory case */
+    /** Strip any trailing slash, if we stored something
+     * but leave "c:\" with backslash (root directory case
+     */
     if (*fname != 0 && win32_name[-1] == '\\' && strlen (fname) != 3) {
         win32_name[-1] = 0;
     } else {

diff --git a/bacula/src/win32/filed/vss.cpp b/bacula/src/win32/filed/vss.cpp
index 5e78ef8ce9e8cfac756449edc63dad1148f929cd..45ce160c6985558f7dbe75307c9d8c01f3920cdd 100644 (file)
--- a/bacula/src/win32/filed/vss.cpp
+++ b/bacula/src/win32/filed/vss.cpp
@@ -215,7 +215,13 @@ const char* VSSClient::GetWriterInfo(int nIndex)
 const int VSSClient::GetWriterState(int nIndex)
 {
    alist* pV = m_pAlistWriterState;   
-   return (int64_t)pV->get(nIndex);
+   void *item = pV->get(nIndex);
+/* Eliminate compiler warnings */
+#ifdef HAVE_VSS64
+   return (int64_t)(char *)item;
+#else
+   return (int)(char *)item;
+#endif
 }
 
 void VSSClient::AppendWriterInfo(int nState, const char* pszInfo)

diff --git a/bacula/src/win32/filed/vss.h b/bacula/src/win32/filed/vss.h
index 04ea7acc651e93015f4f7bdf6bf0872952fa197e..9a0192eae5756b71e7480d92ff3b196691b33bd9 100644 (file)
--- a/bacula/src/win32/filed/vss.h
+++ b/bacula/src/win32/filed/vss.h
@@ -146,6 +146,9 @@ private:
 
 extern VSSClient *g_pVSSClient;
 
+BOOL VSSPathConvert(const char *szFilePath, char *szShadowPath, int nBuflen);
+BOOL VSSPathConvertW(const wchar_t *szFilePath, wchar_t *szShadowPath, int nBuflen);
+
 #endif /* WIN32_VSS */
 
 #endif /* __VSS_H_ */

diff --git a/bacula/src/win32/filed/vss_generic.cpp b/bacula/src/win32/filed/vss_generic.cpp
index 034113e42f680f775560443ecfd6ecc33978606c..47199945478a0563ce2b5b0f8debac4787672cb1 100644 (file)
--- a/bacula/src/win32/filed/vss_generic.cpp
+++ b/bacula/src/win32/filed/vss_generic.cpp
@@ -81,6 +81,7 @@ class IXMLDOMDocument;
 #endif
 
 /* Reduce compiler warnings from Windows vss code */
+#undef uuid
 #define uuid(x)
 
 #ifdef B_VSS_XP