From dbd757761c1da90ef8bb52b114c5810b582396a8 Mon Sep 17 00:00:00 2001
From: VictorSpirin <vvs13@mail.ru>
Date: Tue, 13 Mar 2018 18:45:52 +0300
Subject: [PATCH] update VS project

---
 msvs/template.pg_probackup.vcxproj | 14 ++++++++++----
 src/data.c                         |  2 +-
 src/utils/logger.c                 |  4 ++--
 3 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/msvs/template.pg_probackup.vcxproj b/msvs/template.pg_probackup.vcxproj
index 03caf86c..044a3e73 100644
--- a/msvs/template.pg_probackup.vcxproj
+++ b/msvs/template.pg_probackup.vcxproj
@@ -69,22 +69,26 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <LinkIncremental>true</LinkIncremental>
     <IncludePath>../;@PGSRC@\include;@PGSRC@\bin\pg_basebackup;@PGSRC@\bin\pg_rewind;@PGSRC@\include\port\win32_msvc;@PGSRC@\interfaces\libpq;@PGSRC@\include\port\win32;@PGSRC@\port;@ADDINCLUDE@;@PGSRC@;$(IncludePath)</IncludePath>
-    <LibraryPath>@PGROOT@\lib;@$(LibraryPath)</LibraryPath>
+    <LibraryPath>@PGROOT@\lib;$(LibraryPath)</LibraryPath>
+    <ExcludePath />
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <LinkIncremental>true</LinkIncremental>
     <IncludePath>../;@PGSRC@\include;@PGSRC@\bin\pg_basebackup;@PGSRC@\bin\pg_rewind;@PGSRC@\include\port\win32_msvc;@PGSRC@\interfaces\libpq;@PGSRC@\include\port\win32;@PGSRC@\port;@ADDINCLUDE@;@PGSRC@;$(IncludePath)</IncludePath>
-    <LibraryPath>@PGROOT@\lib;@$(LibraryPath)</LibraryPath>
+    <LibraryPath>@PGROOT@\lib;$(LibraryPath)</LibraryPath>
+    <ExcludePath />
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <LinkIncremental>false</LinkIncremental>
     <IncludePath>../;@PGSRC@\include;@PGSRC@\bin\pg_basebackup;@PGSRC@\bin\pg_rewind;@PGSRC@\include\port\win32_msvc;@PGSRC@\interfaces\libpq;@PGSRC@\include\port\win32;@PGSRC@\port;@ADDINCLUDE@;@PGSRC@;$(IncludePath)</IncludePath>
-    <LibraryPath>@PGROOT@\lib;@$(LibraryPath)</LibraryPath>
+    <LibraryPath>@PGROOT@\lib;$(LibraryPath)</LibraryPath>
+    <ExcludePath />
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <LinkIncremental>false</LinkIncremental>
     <IncludePath>../;@PGSRC@\include;@PGSRC@\bin\pg_basebackup;@PGSRC@\bin\pg_rewind;@PGSRC@\include\port\win32_msvc;@PGSRC@\interfaces\libpq;@PGSRC@\include\port\win32;@PGSRC@\port;@ADDINCLUDE@;@PGSRC@;$(IncludePath)</IncludePath>
-    <LibraryPath>@PGROOT@\lib;@$(LibraryPath)</LibraryPath>
+    <LibraryPath>@PGROOT@\lib;$(LibraryPath)</LibraryPath>
+    <ExcludePath />
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
@@ -134,6 +138,7 @@
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
       <AdditionalDependencies>@ADDLIBS32@;libpgfeutils.lib;libpgcommon.lib;libpgport.lib;libpq.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <IgnoreSpecificDefaultLibraries>libc;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
     </Link>
   </ItemDefinitionGroup>
@@ -154,6 +159,7 @@
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
       <AdditionalDependencies>@ADDLIBS@;libpgfeutils.lib;libpgcommon.lib;libpgport.lib;libpq.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <IgnoreSpecificDefaultLibraries>libc;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
     </Link>
   </ItemDefinitionGroup>
diff --git a/src/data.c b/src/data.c
index 95966ace..6a76a844 100644
--- a/src/data.c
+++ b/src/data.c
@@ -853,7 +853,7 @@ push_wal_file(const char *from_path, const char *to_path, bool is_compress,
 			  bool overwrite)
 {
 	FILE	   *in = NULL;
-	FILE	   *out;
+	FILE	   *out=NULL;
 	char		buf[XLOG_BLCKSZ];
 	const char *to_path_p = to_path;
 	char		to_path_temp[MAXPGPATH];
diff --git a/src/utils/logger.c b/src/utils/logger.c
index a380888e..5a069fa3 100644
--- a/src/utils/logger.c
+++ b/src/utils/logger.c
@@ -143,8 +143,8 @@ elog_internal(int elevel, bool file_only, const char *fmt, va_list args)
 	bool		write_to_file,
 				write_to_error_log,
 				write_to_stderr;
-	va_list		error_args,
-				std_args;
+	va_list		error_args=NULL,
+				std_args=NULL;
 	time_t		log_time = (time_t) time(NULL);
 	char		strfbuf[128];