From: Thorsten Engel <thorsten.engel@matrix-computer.com>
Date: Thu, 18 May 2006 17:29:38 +0000 (+0000)
Subject: - improved code style of last commit ;-)
X-Git-Tag: Release-2.0.0~859
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=9628ebd25c10468a7c7aed54db2d30e1c9b6fab0;p=bacula%2Fbacula

- improved code style of last commit ;-)


git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@3025 91ce42f0-d328-0410-95d8-f526ca767f89
---

diff --git a/bacula/src/filed/backup.c b/bacula/src/filed/backup.c
index 6088f157ad..73a57e5be9 100644
--- a/bacula/src/filed/backup.c
+++ b/bacula/src/filed/backup.c
@@ -714,7 +714,7 @@ int send_data(JCR *jcr, int stream, FF_PKT *ff_pkt, DIGEST *digest, DIGEST *sign
             goto err;
          }
          compress_len = zstream.total_out;
-         blibzInited = deflateReset (&zstream) == Z_OK;
+         blibzInited = deflateReset(&zstream) == Z_OK;
 
          Dmsg2(400, "compressed len=%d uncompressed len=%d\n",
             compress_len, sd->msglen);
diff --git a/bacula/src/lib/winapi.c b/bacula/src/lib/winapi.c
index fe6b7eb007..58a20fd715 100644
--- a/bacula/src/lib/winapi.c
+++ b/bacula/src/lib/winapi.c
@@ -248,7 +248,7 @@ InitWinAPIWrapper()
          break;
    }
 #endif /* WIN32_VSS */
-   atexit (Win32ConvCleanupCache);
+   atexit(Win32ConvCleanupCache);
 }
 
 #else
diff --git a/bacula/src/win32/baculafd/baculafd.vcproj b/bacula/src/win32/baculafd/baculafd.vcproj
index c3d818b78c..6dc5dbf1d9 100644
--- a/bacula/src/win32/baculafd/baculafd.vcproj
+++ b/bacula/src/win32/baculafd/baculafd.vcproj
@@ -1,207 +1,170 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="8.00"
+	Version="7.10"
 	Name="baculafd"
-	ProjectGUID="{6A435DBB-4D3D-4DAE-8CB3-E0AF169A240B}"
-	RootNamespace="baculafd"
-	Keyword="MFCProj"
-	>
+	ProjectGUID="{D1A9DA7E-7BBA-4E74-B21E-2440124D191E}"
+	Keyword="Win32Proj">
 	<Platforms>
 		<Platform
-			Name="Win32"
-		/>
+			Name="Win32"/>
 	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
 	<Configurations>
 		<Configuration
-			Name="Release|Win32"
-			OutputDirectory=".\Release"
-			IntermediateDirectory=".\Release"
+			Name="Debug|Win32"
+			OutputDirectory="Debug"
+			IntermediateDirectory="Debug"
 			ConfigurationType="1"
-			InheritedPropertySheets="UpgradeFromVC60.vsprops"
-			UseOfMFC="1"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TypeLibraryName=".\Release/baculafd.tlb"
-				HeaderFileName=""
-			/>
+			UseOfATL="1"
+			CharacterSet="2">
 			<Tool
 				Name="VCCLCompilerTool"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../compat,../..,../../../../depkgs-win32/pthreads,../../../../depkgs-win32/zlib;../../../../depkgs-win32/gettext/include"
-				PreprocessorDefinitions="NDEBUG;WIN32;_CONSOLE;HAVE_WIN32"
-				StringPooling="true"
-				RuntimeLibrary="0"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile=".\Release/baculafd.pch"
-				AssemblerListingLocation=".\Release/"
-				ObjectFile=".\Release/"
-				ProgramDataBaseFileName=".\Release/"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\compat;..\..;..\..\..\..\depkgs-win32\pthreads;..\..\..\..\depkgs-win32\zlib"
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;HAVE_WIN32;ZLIB_WINAPI;_WIN32_WINNT=0x500;VSS_XP;WIN32_VSS"
+				MinimalRebuild="TRUE"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				UsePrecompiledHeader="0"
 				WarningLevel="3"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1033"
-				AdditionalIncludeDirectories=""
-			/>
+				Detect64BitPortabilityProblems="TRUE"
+				DebugInformationFormat="4"/>
 			<Tool
-				Name="VCPreLinkEventTool"
-			/>
+				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="wsock32.lib pthreadVCE.lib zlib.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib uuid.lib intl.lib"
-				OutputFile="Release/bacula-fd.exe"
-				LinkIncremental="0"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="../../../../depkgs-win32/pthreads,../../../../depkgs-win32/zlib;../../../../depkgs-win32/gettext/lib"
-				IgnoreDefaultLibraryNames="MSVCRT.lib"
-				DelayLoadDLLs="$(NOINHERIT)"
+				AdditionalDependencies="pthreadVCE.lib zlib.lib wsock32.lib"
+				OutputFile="$(OutDir)/baculafd.exe"
+				LinkIncremental="2"
+				AdditionalLibraryDirectories="&quot;..\..\..\..\depkgs-win32\pthreads&quot;;&quot;..\..\..\..\depkgs-win32\zlib\Debug&quot;"
+				GenerateDebugInformation="TRUE"
+				ProgramDatabaseFile="$(OutDir)/baculafd.pdb"
 				SubSystem="2"
-				TargetMachine="1"
-			/>
+				TargetMachine="1"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
 			<Tool
-				Name="VCALinkTool"
-			/>
+				Name="VCPreBuildEventTool"/>
 			<Tool
-				Name="VCManifestTool"
-			/>
+				Name="VCPreLinkEventTool"/>
 			<Tool
-				Name="VCXDCMakeTool"
-			/>
+				Name="VCResourceCompilerTool"/>
 			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile=".\Release/baculafd.bsc"
-			/>
+				Name="VCWebServiceProxyGeneratorTool"/>
 			<Tool
-				Name="VCFxCopTool"
-			/>
+				Name="VCXMLDataGeneratorTool"/>
 			<Tool
-				Name="VCAppVerifierTool"
-			/>
+				Name="VCWebDeploymentTool"/>
 			<Tool
-				Name="VCWebDeploymentTool"
-			/>
+				Name="VCManagedWrapperGeneratorTool"/>
 			<Tool
-				Name="VCPostBuildEventTool"
-			/>
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
 		</Configuration>
 		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory=".\Debug"
-			IntermediateDirectory=".\Debug"
+			Name="Release|Win32"
+			OutputDirectory="Release"
+			IntermediateDirectory="Release"
 			ConfigurationType="1"
-			InheritedPropertySheets="UpgradeFromVC60.vsprops"
 			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
+			UseOfATL="1"
+			CharacterSet="2">
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalIncludeDirectories="..\compat;..\..;..\..\..\..\depkgs-win32\pthreads;..\..\..\..\depkgs-win32\zlib"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;HAVE_WIN32;HAVE_ZLIB;ZLIB_WINAPI;_WIN32_WINNT=0x500;WIN32_VSS"
+				RuntimeLibrary="0"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="TRUE"
+				DebugInformationFormat="3"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="pthreadVCE.lib zlib.lib wsock32.lib"
+				OutputFile="$(OutDir)/baculafd.exe"
+				LinkIncremental="1"
+				AdditionalLibraryDirectories="&quot;..\..\..\..\depkgs-win32\pthreads&quot;;&quot;..\..\..\..\depkgs-win32\zlib\release&quot;"
+				IgnoreDefaultLibraryNames="MSVCRT"
+				GenerateDebugInformation="TRUE"
+				SubSystem="2"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				TargetMachine="1"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
 			<Tool
-				Name="VCPreBuildEventTool"
-			/>
+				Name="VCPreLinkEventTool"/>
 			<Tool
-				Name="VCCustomBuildTool"
-			/>
+				Name="VCResourceCompilerTool"/>
 			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
+				Name="VCWebServiceProxyGeneratorTool"/>
 			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
+				Name="VCXMLDataGeneratorTool"/>
 			<Tool
-				Name="VCMIDLTool"
-				TypeLibraryName=".\Debug/baculafd.tlb"
-				HeaderFileName=""
-			/>
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
+		<Configuration
+			Name="Debug Unicode|Win32"
+			OutputDirectory="$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="1"
+			UseOfATL="1"
+			CharacterSet="2">
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="../compat,../..,../../../../depkgs-win32/pthreads,../../../../depkgs-win32/zlib,../../../../depkgs-win32/gettext/include"
-				PreprocessorDefinitions="_DEBUG;_WINMAIN_;PTW32_BUILD;WIN32;_CONSOLE;HAVE_WIN32"
-				MinimalRebuild="true"
+				AdditionalIncludeDirectories="..\compat;..\..;..\..\..\..\depkgs-win32\pthreads;..\..\..\..\depkgs-win32\zlib"
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;HAVE_ZLIB;HAVE_WIN32;ZLIB_WINAPI;_WIN32_WINNT=0x500;VSS_XP;WIN32_VSS;USE_WIN32STREAMEXTRACTION"
+				MinimalRebuild="TRUE"
 				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				PrecompiledHeaderFile=".\Debug/baculafd.pch"
-				AssemblerListingLocation=".\Debug/"
-				ObjectFile=".\Debug/"
-				ProgramDataBaseFileName=".\Debug/"
-				BrowseInformation="1"
+				RuntimeLibrary="3"
+				UsePrecompiledHeader="0"
 				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="4"
-			/>
+				Detect64BitPortabilityProblems="TRUE"
+				DebugInformationFormat="4"/>
 			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1033"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
+				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="wsock32.lib pthreadVCE.lib zlib.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib intl.lib"
-				OutputFile="Debug/bacula-fd.exe"
-				LinkIncremental="0"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="../../../../depkgs-win32/pthreads,../../../../depkgs-win32/zlib,../../../../depkgs-win32/gettext/lib"
-				IgnoreDefaultLibraryNames="MSVCRT.lib"
-				GenerateDebugInformation="true"
+				AdditionalDependencies="pthreadVCE.lib zlib.lib wsock32.lib"
+				OutputFile="$(OutDir)/baculafd.exe"
+				LinkIncremental="2"
+				AdditionalLibraryDirectories="&quot;..\..\..\..\depkgs-win32\pthreads&quot;;&quot;..\..\..\..\depkgs-win32\zlib\Debug&quot;"
+				GenerateDebugInformation="TRUE"
+				ProgramDatabaseFile="$(OutDir)/baculafd.pdb"
 				SubSystem="2"
-				TargetMachine="1"
-			/>
+				TargetMachine="1"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
 			<Tool
-				Name="VCALinkTool"
-			/>
+				Name="VCPreBuildEventTool"/>
 			<Tool
-				Name="VCManifestTool"
-			/>
+				Name="VCPreLinkEventTool"/>
 			<Tool
-				Name="VCXDCMakeTool"
-			/>
+				Name="VCResourceCompilerTool"/>
 			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile=".\Debug/baculafd.bsc"
-			/>
+				Name="VCWebServiceProxyGeneratorTool"/>
 			<Tool
-				Name="VCFxCopTool"
-			/>
+				Name="VCXMLDataGeneratorTool"/>
 			<Tool
-				Name="VCAppVerifierTool"
-			/>
+				Name="VCWebDeploymentTool"/>
 			<Tool
-				Name="VCWebDeploymentTool"
-			/>
+				Name="VCManagedWrapperGeneratorTool"/>
 			<Tool
-				Name="VCPostBuildEventTool"
-			/>
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
 		</Configuration>
 	</Configurations>
 	<References>
@@ -209,399 +172,367 @@
 	<Files>
 		<Filter
 			Name="Source Files"
-			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-			>
+			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
 			<File
-				RelativePath="..\lib\address_conf.cpp"
-				>
+				RelativePath="..\lib\address_conf.cpp">
 			</File>
 			<File
-				RelativePath="..\lib\alist.cpp"
-				>
+				RelativePath="..\lib\alist.cpp">
 			</File>
 			<File
-				RelativePath="..\lib\alloc.cpp"
-				>
+				RelativePath="..\lib\alloc.cpp">
 			</File>
 			<File
-				RelativePath="..\lib\attr.cpp"
-				>
+				RelativePath="..\lib\attr.cpp">
 			</File>
 			<File
-				RelativePath="..\findlib\attribs.cpp"
-				>
+				RelativePath="..\findlib\attribs.cpp">
 			</File>
 			<File
-				RelativePath="..\filed\authenticate.cpp"
-				>
+				RelativePath="..\filed\authenticate.cpp">
 			</File>
 			<File
-				RelativePath="..\filed\backup.cpp"
-				>
+				RelativePath="..\filed\backup.cpp">
 			</File>
 			<File
-				RelativePath="..\lib\base64.cpp"
-				>
+				RelativePath="..\lib\base64.cpp">
 			</File>
 			<File
-				RelativePath="..\lib\berrno.cpp"
-				>
+				RelativePath="..\lib\berrno.cpp">
 			</File>
 			<File
-				RelativePath="..\findlib\bfile.cpp"
-				>
+				RelativePath="..\findlib\bfile.cpp">
 			</File>
 			<File
-				RelativePath="..\lib\bget_msg.cpp"
-				>
+				RelativePath="..\lib\bget_msg.cpp">
 			</File>
 			<File
-				RelativePath="..\lib\bnet.cpp"
-				>
+				RelativePath="..\lib\bnet.cpp">
 			</File>
 			<File
-				RelativePath="..\lib\bnet_server.cpp"
-				>
+				RelativePath="..\lib\bnet_server.cpp">
 			</File>
 			<File
-				RelativePath="..\lib\bshm.cpp"
-				>
+				RelativePath="..\lib\bregex.cpp">
 			</File>
 			<File
-				RelativePath="..\lib\bsys.cpp"
-				>
+				RelativePath="..\lib\bshm.cpp">
 			</File>
 			<File
-				RelativePath="..\lib\btime.cpp"
-				>
+				RelativePath="..\lib\bsys.cpp">
 			</File>
 			<File
-				RelativePath="..\lib\btimers.cpp"
-				>
+				RelativePath="..\lib\btime.cpp">
 			</File>
 			<File
-				RelativePath="..\filed\chksum.cpp"
-				>
+				RelativePath="..\lib\btimers.cpp">
 			</File>
 			<File
-				RelativePath="..\compat\compat.cpp"
-				>
+				RelativePath="..\compat\compat.cpp">
 			</File>
 			<File
-				RelativePath="..\lib\cram-md5.cpp"
-				>
+				RelativePath="..\lib\cram-md5.cpp">
 			</File>
 			<File
-				RelativePath="..\lib\crc32.cpp"
-				>
+				RelativePath="..\lib\crc32.cpp">
 			</File>
 			<File
-				RelativePath="..\findlib\create_file.cpp"
-				>
+				RelativePath="..\findlib\create_file.cpp">
 			</File>
 			<File
-				RelativePath="..\lib\daemon.cpp"
-				>
+				RelativePath="..\lib\crypto.cpp">
 			</File>
 			<File
-				RelativePath="..\lib\dlist.cpp"
-				>
+				RelativePath="..\lib\daemon.cpp">
 			</File>
 			<File
-				RelativePath="..\lib\edit.cpp"
-				>
+				RelativePath="..\lib\dlist.cpp">
 			</File>
 			<File
-				RelativePath="..\findlib\enable_priv.cpp"
-				>
+				RelativePath="..\lib\edit.cpp">
 			</File>
 			<File
-				RelativePath="..\filed\estimate.cpp"
-				>
+				RelativePath="..\findlib\enable_priv.cpp">
 			</File>
 			<File
-				RelativePath="..\filed\filed.cpp"
-				>
+				RelativePath="..\filed\estimate.cpp">
 			</File>
 			<File
-				RelativePath="..\filed\filed_conf.cpp"
-				>
+				RelativePath="..\filed\filed.cpp">
 			</File>
 			<File
-				RelativePath="..\findlib\find.cpp"
-				>
+				RelativePath="..\filed\filed_conf.cpp">
 			</File>
 			<File
-				RelativePath="..\findlib\find_one.cpp"
-				>
+				RelativePath="..\findlib\find.cpp">
 			</File>
 			<File
-				RelativePath="..\lib\fnmatch.cpp"
-				>
+				RelativePath="..\findlib\find_one.cpp">
 			</File>
 			<File
-				RelativePath="..\findlib\fstype.cpp"
-				>
+				RelativePath="..\lib\fnmatch.cpp">
 			</File>
 			<File
-				RelativePath="..\compat\getopt.c"
-				>
+				RelativePath="..\findlib\fstype.cpp">
 			</File>
 			<File
-				RelativePath="..\filed\heartbeat.cpp"
-				>
+				RelativePath="..\compat\getopt.c">
 			</File>
 			<File
-				RelativePath="..\lib\hmac.cpp"
-				>
+				RelativePath="..\filed\heartbeat.cpp">
 			</File>
 			<File
-				RelativePath="..\lib\htable.cpp"
-				>
+				RelativePath="..\lib\hmac.cpp">
 			</File>
 			<File
-				RelativePath="..\lib\idcache.cpp"
-				>
+				RelativePath="..\lib\htable.cpp">
 			</File>
 			<File
-				RelativePath="..\lib\jcr.cpp"
-				>
+				RelativePath="..\lib\idcache.cpp">
 			</File>
 			<File
-				RelativePath="..\filed\job.cpp"
-				>
+				RelativePath="..\lib\jcr.cpp">
 			</File>
 			<File
-				RelativePath="..\lib\lex.cpp"
-				>
+				RelativePath="..\filed\job.cpp">
 			</File>
 			<File
-				RelativePath="..\findlib\makepath.cpp"
-				>
+				RelativePath="..\lib\lex.cpp">
 			</File>
 			<File
-				RelativePath="..\findlib\match.cpp"
-				>
+				RelativePath="..\findlib\makepath.cpp">
 			</File>
 			<File
-				RelativePath="..\lib\md5.cpp"
-				>
+				RelativePath="..\findlib\match.cpp">
 			</File>
 			<File
-				RelativePath="..\lib\mem_pool.cpp"
-				>
+				RelativePath="..\lib\md5.cpp">
 			</File>
 			<File
-				RelativePath="..\lib\message.cpp"
-				>
+				RelativePath="..\lib\mem_pool.cpp">
 			</File>
 			<File
-				RelativePath="..\lib\parse_conf.cpp"
-				>
+				RelativePath="..\lib\message.cpp">
 			</File>
 			<File
-				RelativePath="..\compat\print.cpp"
-				>
+				RelativePath="..\lib\parse_conf.cpp">
 			</File>
 			<File
-				RelativePath="..\lib\pythonlib.cpp"
-				>
+				RelativePath="..\compat\print.cpp">
 			</File>
 			<File
-				RelativePath="..\lib\queue.cpp"
-				>
+				RelativePath="..\lib\pythonlib.cpp">
 			</File>
 			<File
-				RelativePath="..\lib\regex.cpp"
-				>
+				RelativePath="..\lib\queue.cpp">
 			</File>
 			<File
-				RelativePath="..\lib\res.cpp"
-				>
+				RelativePath="..\lib\res.cpp">
 			</File>
 			<File
-				RelativePath="..\filed\restore.cpp"
-				>
+				RelativePath="..\filed\restore.cpp">
 			</File>
 			<File
-				RelativePath="..\lib\rwlock.cpp"
-				>
+				RelativePath="..\lib\rwlock.cpp">
 			</File>
 			<File
-				RelativePath="..\findlib\save-cwd.cpp"
-				>
+				RelativePath="..\findlib\save-cwd.cpp">
 			</File>
 			<File
-				RelativePath="..\lib\scan.cpp"
-				>
+				RelativePath="..\lib\scan.cpp">
 			</File>
 			<File
-				RelativePath="..\lib\semlock.cpp"
-				>
+				RelativePath="..\lib\semlock.cpp">
 			</File>
 			<File
-				RelativePath="..\lib\serial.cpp"
-				>
+				RelativePath="..\lib\serial.cpp">
 			</File>
 			<File
-				RelativePath="..\lib\sha1.cpp"
-				>
+				RelativePath="..\lib\sha1.cpp">
 			</File>
 			<File
-				RelativePath="..\lib\signal.cpp"
-				>
+				RelativePath="..\lib\signal.cpp">
 			</File>
 			<File
-				RelativePath="..\lib\smartall.cpp"
-				>
+				RelativePath="..\lib\smartall.cpp">
 			</File>
 			<File
-				RelativePath="..\filed\status.cpp"
-				>
+				RelativePath="..\filed\status.cpp">
 			</File>
 			<File
-				RelativePath=".\StdAfx.cpp"
-				>
+				RelativePath=".\StdAfx.cpp">
 			</File>
 			<File
-				RelativePath="..\lib\tls.cpp"
-				>
+				RelativePath="..\lib\tls.cpp">
 			</File>
 			<File
-				RelativePath="..\lib\tree.cpp"
-				>
+				RelativePath="..\lib\tree.cpp">
 			</File>
 			<File
-				RelativePath="..\lib\util.cpp"
-				>
+				RelativePath="..\lib\util.cpp">
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						PreprocessorDefinitions="HAVE_CONSOLE"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						PreprocessorDefinitions="HAVE_CONSOLE"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug Unicode|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						PreprocessorDefinitions="HAVE_CONSOLE"/>
+				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\lib\var.cpp"
-				>
+				RelativePath="..\lib\var.cpp">
 			</File>
 			<File
-				RelativePath="..\filed\verify.cpp"
-				>
+				RelativePath="..\filed\verify.cpp">
 			</File>
 			<File
-				RelativePath="..\filed\verify_vol.cpp"
-				>
+				RelativePath="..\filed\verify_vol.cpp">
 			</File>
 			<File
-				RelativePath="..\lib\watchdog.cpp"
-				>
+				RelativePath="..\compat\vss.cpp">
 			</File>
 			<File
-				RelativePath="..\..\filed\win32\winabout.cpp"
-				>
+				RelativePath="..\compat\vss_W2K3.cpp">
 			</File>
 			<File
-				RelativePath="..\lib\winapi.cpp"
-				>
+				RelativePath="..\compat\vss_XP.cpp">
 			</File>
 			<File
-				RelativePath="..\..\filed\win32\winevents.cpp"
-				>
+				RelativePath="..\lib\watchdog.cpp">
 			</File>
 			<File
-				RelativePath="..\..\filed\win32\winmain.cpp"
-				>
+				RelativePath="..\..\filed\win32\winabout.cpp">
 			</File>
 			<File
-				RelativePath="..\..\filed\win32\winservice.cpp"
-				>
+				RelativePath="..\findlib\winapi.cpp">
 			</File>
 			<File
-				RelativePath="..\..\filed\win32\winstat.cpp"
-				>
+				RelativePath="..\..\filed\win32\winevents.cpp">
 			</File>
 			<File
-				RelativePath="..\..\filed\win32\wintray.cpp"
-				>
+				RelativePath="..\..\filed\win32\winmain.cpp">
 			</File>
 			<File
-				RelativePath="..\lib\workq.cpp"
-				>
+				RelativePath="..\..\filed\win32\winres.rc">
+			</File>
+			<File
+				RelativePath="..\..\filed\win32\winservice.cpp">
+			</File>
+			<File
+				RelativePath="..\..\filed\win32\winstat.cpp">
+			</File>
+			<File
+				RelativePath="..\..\filed\win32\wintray.cpp">
+			</File>
+			<File
+				RelativePath="..\lib\workq.cpp">
 			</File>
 		</Filter>
 		<Filter
 			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl"
-			>
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
+			<File
+				RelativePath="..\compat\alloca.h">
+			</File>
+			<File
+				RelativePath="..\compat\compat.h">
+			</File>
+			<File
+				RelativePath="..\compat\dirent.h">
+			</File>
+			<File
+				RelativePath="..\compat\getopt.h">
+			</File>
+			<File
+				RelativePath="..\compat\grp.h">
+			</File>
 			<File
-				RelativePath=".\StdAfx.h"
-				>
+				RelativePath="..\compat\host.h">
 			</File>
 			<File
-				RelativePath="..\..\filed\win32\winabout.h"
-				>
+				RelativePath="..\compat\mswinver.h">
 			</File>
 			<File
-				RelativePath="..\..\filed\win32\winbacula.h"
-				>
+				RelativePath="..\compat\netdb.h">
 			</File>
 			<File
-				RelativePath="..\compat\winconfig.h"
-				>
+				RelativePath="..\compat\pwd.h">
 			</File>
 			<File
-				RelativePath="..\..\filed\win32\winevents.h"
-				>
+				RelativePath="..\compat\sched.h">
 			</File>
 			<File
-				RelativePath="..\..\filed\win32\winres.h"
-				>
+				RelativePath=".\StdAfx.h">
 			</File>
 			<File
-				RelativePath="..\..\filed\win32\winservice.h"
-				>
+				RelativePath="..\compat\stdint.h">
 			</File>
 			<File
-				RelativePath="..\..\filed\win32\winstat.h"
-				>
+				RelativePath="..\compat\strings.h">
 			</File>
 			<File
-				RelativePath="..\..\filed\win32\wintray.h"
-				>
+				RelativePath="..\compat\syslog.h">
+			</File>
+			<File
+				RelativePath="..\compat\unistd.h">
+			</File>
+			<File
+				RelativePath="..\..\filed\win32\winabout.h">
+			</File>
+			<File
+				RelativePath="..\..\filed\win32\winbacula.h">
+			</File>
+			<File
+				RelativePath="..\..\filed\win32\winevents.h">
+			</File>
+			<File
+				RelativePath="..\..\filed\win32\winres.h">
+			</File>
+			<File
+				RelativePath="..\..\filed\win32\winservice.h">
+			</File>
+			<File
+				RelativePath="..\..\filed\win32\winstat.h">
+			</File>
+			<File
+				RelativePath="..\..\filed\win32\wintray.h">
 			</File>
 		</Filter>
 		<Filter
 			Name="Resource Files"
-			Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-			>
-			<File
-				RelativePath="..\..\src\filed\win32\bacula.bmp"
-				>
-			</File>
+			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
+			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">
 			<File
-				RelativePath="..\..\src\filed\win32\bacula.ico"
-				>
+				RelativePath="..\..\src\filed\win32\bacula.bmp">
 			</File>
 			<File
-				RelativePath="..\..\src\filed\win32\error.ico"
-				>
+				RelativePath="..\..\src\filed\win32\bacula.ico">
 			</File>
 			<File
-				RelativePath="..\..\src\filed\win32\idle.ico"
-				>
+				RelativePath="..\..\src\filed\win32\error.ico">
 			</File>
 			<File
-				RelativePath="..\..\src\filed\win32\running.ico"
-				>
+				RelativePath="..\..\src\filed\win32\idle.ico">
 			</File>
 			<File
-				RelativePath="..\..\src\filed\win32\saving.ico"
-				>
+				RelativePath="..\..\src\filed\win32\running.ico">
 			</File>
 			<File
-				RelativePath="..\..\filed\win32\winres.rc"
-				>
+				RelativePath="..\..\src\filed\win32\saving.ico">
 			</File>
 		</Filter>
-		<File
-			RelativePath="ReadMe.txt"
-			>
-		</File>
 	</Files>
 	<Globals>
 	</Globals>
diff --git a/bacula/src/win32/compat/compat.cpp b/bacula/src/win32/compat/compat.cpp
index 6c871331db..f1a172713a 100644
--- a/bacula/src/win32/compat/compat.cpp
+++ b/bacula/src/win32/compat/compat.cpp
@@ -45,19 +45,19 @@
    conversion is called 3 times (lstat, attribs, open),
    by using the cache this is reduced to 1 time */
 
-POOLMEM* g_pWin32ConvUTF8Cache = get_pool_memory (PM_FNAME);
-POOLMEM* g_pWin32ConvUCS2Cache = get_pool_memory (PM_FNAME);
+POOLMEM *g_pWin32ConvUTF8Cache = get_pool_memory (PM_FNAME);
+POOLMEM *g_pWin32ConvUCS2Cache = get_pool_memory (PM_FNAME);
 static pthread_mutex_t Win32Convmutex = PTHREAD_MUTEX_INITIALIZER;
 
 void Win32ConvCleanupCache()
 {
    if (g_pWin32ConvUTF8Cache) {
-      free_pool_memory (g_pWin32ConvUTF8Cache);
+      free_pool_memory(g_pWin32ConvUTF8Cache);
       g_pWin32ConvUTF8Cache = NULL;
    }
 
    if (g_pWin32ConvUCS2Cache) {
-      free_pool_memory (g_pWin32ConvUCS2Cache);   
+      free_pool_memory(g_pWin32ConvUCS2Cache);   
       g_pWin32ConvUCS2Cache = NULL;
    }
 }
@@ -128,7 +128,7 @@ void conv_unix_to_win32_path(const char *name, char *win32_name, DWORD dwSize)
 }
 
 POOLMEM* 
-make_wchar_win32_path(POOLMEM* pszUCSPath, BOOL* pBIsRawPath /*= NULL*/)
+make_wchar_win32_path(POOLMEM *pszUCSPath, BOOL *pBIsRawPath /*= NULL*/)
 {
    /* created 02/27/2006 Thorsten Engel
       
@@ -146,14 +146,14 @@ make_wchar_win32_path(POOLMEM* pszUCSPath, BOOL* pBIsRawPath /*= NULL*/)
    if (!p_GetCurrentDirectoryW)
       return pszUCSPath;
    
-   wchar_t * name = (wchar_t *) pszUCSPath;
+   wchar_t *name = (wchar_t *) pszUCSPath;
 
    /* if it has already the desired form, exit without changes */
-   if (wcslen(name) > 3 && wcsncmp (name, L"\\\\?\\", 4) == 0)
+   if (wcslen(name) > 3 && wcsncmp(name, L"\\\\?\\", 4) == 0)
       return pszUCSPath;
 
-   POOLMEM* pwszBuf = get_pool_memory (PM_FNAME);
-   POOLMEM* pwszCurDirBuf = get_pool_memory (PM_FNAME);
+   POOLMEM *pwszBuf = get_pool_memory(PM_FNAME);
+   POOLMEM *pwszCurDirBuf = get_pool_memory(PM_FNAME);
    DWORD dwCurDirPathSize = 0;
 
    /* get buffer with enough size (name+max 6. wchars+1 null terminator */
@@ -180,12 +180,12 @@ make_wchar_win32_path(POOLMEM* pszUCSPath, BOOL* pBIsRawPath /*= NULL*/)
       bAddCurrentPath = FALSE; 
 
    /* is path relative to itself?, if yes, skip ./ */
-   if (wcslen(name) > 2 && ((wcsncmp (name, L"./", 2) == 0) || (wcsncmp (name, L".\\", 2) == 0))) {
+   if (wcslen(name) > 2 && ((wcsncmp(name, L"./", 2) == 0) || (wcsncmp(name, L".\\", 2) == 0))) {
       name+=2;
    }
 
    /* is path of form '//./'? */   
-   if (wcslen(name) > 3 && ((wcsncmp (name, L"//./", 4) == 0) || (wcsncmp (name, L"\\\\.\\", 4) == 0))) {
+   if (wcslen(name) > 3 && ((wcsncmp(name, L"//./", 4) == 0) || (wcsncmp(name, L"\\\\.\\", 4) == 0))) {
       bAddDrive = FALSE;
       bAddCurrentPath = FALSE;
       bAddPrefix = FALSE;
@@ -242,7 +242,7 @@ make_wchar_win32_path(POOLMEM* pszUCSPath, BOOL* pBIsRawPath /*= NULL*/)
       pwszBuf = check_pool_memory_size(pwszBuf, dwBufCharsNeeded*sizeof(wchar_t));
       /* get directory into own buffer as it may either return c:\... or \\?\C:\.... */
       
-      if (dwCurDirPathSize > 3 && wcsncmp ((LPCWSTR)pwszCurDirBuf, L"\\\\?\\", 4) == 0)
+      if (dwCurDirPathSize > 3 && wcsncmp((LPCWSTR)pwszCurDirBuf, L"\\\\?\\", 4) == 0)
          /* copy complete string */
          wcscpy((wchar_t *) pwszBuf, (LPCWSTR)pwszCurDirBuf);          
       else
@@ -259,7 +259,7 @@ make_wchar_win32_path(POOLMEM* pszUCSPath, BOOL* pBIsRawPath /*= NULL*/)
    }
 
 
-   wchar_t * win32_name = (wchar_t *)pwszBuf+nParseOffset;
+   wchar_t *win32_name = (wchar_t *)pwszBuf+nParseOffset;
 
    while (*name) {
       /* Check for Unix separator and convert to Win32 */
@@ -303,8 +303,8 @@ make_wchar_win32_path(POOLMEM* pszUCSPath, BOOL* pBIsRawPath /*= NULL*/)
    }   
 #endif
 
-   free_pool_memory (pszUCSPath);
-   free_pool_memory (pwszCurDirBuf);
+   free_pool_memory(pszUCSPath);
+   free_pool_memory(pwszCurDirBuf);
 
    return pwszBuf;
 }
@@ -374,10 +374,10 @@ make_win32_path_UTF8_2_wchar(POOLMEM **pszUCS, const char *pszUTF, BOOL* pBIsRaw
 {
    P(Win32Convmutex);
    /* if we find the utf8 string in cache, we use the cached ucs2 version */
-   if (bstrcmp (pszUTF, g_pWin32ConvUTF8Cache)) {
+   if (bstrcmp(pszUTF, g_pWin32ConvUTF8Cache)) {
       int32_t nBufSize = sizeof_pool_memory(g_pWin32ConvUCS2Cache);
       *pszUCS = check_pool_memory_size(*pszUCS, nBufSize);      
-      wcscpy ((LPWSTR) *pszUCS, (LPWSTR) g_pWin32ConvUCS2Cache);
+      wcscpy((LPWSTR) *pszUCS, (LPWSTR) g_pWin32ConvUCS2Cache);
       V(Win32Convmutex);
       return nBufSize / sizeof (WCHAR);
    }
@@ -396,10 +396,10 @@ make_win32_path_UTF8_2_wchar(POOLMEM **pszUCS, const char *pszUTF, BOOL* pBIsRaw
    /* populate cache */   
    int32_t nBufSize = sizeof_pool_memory(*pszUCS);
    g_pWin32ConvUCS2Cache = check_pool_memory_size(g_pWin32ConvUCS2Cache, nBufSize);
-   wcscpy ((LPWSTR) g_pWin32ConvUCS2Cache, (LPWSTR) *pszUCS);
-   nBufSize = strlen (pszUTF)+1;
+   wcscpy((LPWSTR) g_pWin32ConvUCS2Cache, (LPWSTR) *pszUCS);
+   nBufSize = strlen(pszUTF)+1;
    g_pWin32ConvUTF8Cache = check_pool_memory_size(g_pWin32ConvUTF8Cache, nBufSize);
-   bstrncpy (g_pWin32ConvUTF8Cache, pszUTF, nBufSize);
+   bstrncpy(g_pWin32ConvUTF8Cache, pszUTF, nBufSize);
    V(Win32Convmutex);
 
    return nRet;