From bd644c5d6dbe924451e25f6942c9f4bb0baaae5a Mon Sep 17 00:00:00 2001
From: Kevin Mackey <kmackey@perforce.com>
Date: Fri, 22 Oct 2021 09:20:36 -0700
Subject: [PATCH] Fix all warnings in a Windows build.

A few code changes fixed warnings, removed debug info for release builds, and added condition for copying .pbd which is not present in a release build.
---
 P4Plugin/P4Plugin.vcxproj          | 8 ++++----
 P4Plugin/Source/P4Task.cpp         | 2 +-
 Test/Source/TestServer.cpp         | 4 ++--
 Test/TestServer/TestServer.vcxproj | 2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/P4Plugin/P4Plugin.vcxproj b/P4Plugin/P4Plugin.vcxproj
index 23dd409..60f9efd 100644
--- a/P4Plugin/P4Plugin.vcxproj
+++ b/P4Plugin/P4Plugin.vcxproj
@@ -148,7 +148,8 @@ _SCL_SECURE_NO_DEPRECATE
       <AdditionalDependencies>libclient.lib;libeay32.lib;ssleay32.lib;librpc.lib;libsupp.lib;ws2_32.lib;shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
     <PostBuildEvent>
-      <Command>echo f | xcopy "$(SolutionDir)$(Configuration)\$(TargetFileName)" "$(SolutionDir)Build\Win32\$(TargetFileName)" /Y</Command>
+      <Command>echo f | xcopy "$(SolutionDir)$(Configuration)\$(TargetFileName)" "$(SolutionDir)Build\Win32\$(TargetFileName)" /Y
+echo f | if exist "$(SolutionDir)$(Configuration)\$(TargetName).pdb" xcopy "$(SolutionDir)$(Configuration)\$(TargetName).pdb" "$(SolutionDir)Build\Win32\$(TargetName).pdb" /Y</Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -167,15 +168,14 @@ _SCL_SECURE_NO_DEPRECATE
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <GenerateDebugInformation>false</GenerateDebugInformation>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
       <AdditionalLibraryDirectories>$(ProjectDir)Source\r16.1\lib\win32;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <AdditionalDependencies>libclient.lib;libeay32.lib;ssleay32.lib;librpc.lib;libsupp.lib;ws2_32.lib;shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
     <PostBuildEvent>
-      <Command>echo f | xcopy "$(SolutionDir)$(Configuration)\$(TargetFileName)" "$(SolutionDir)Build\Win32\$(TargetFileName)" /Y
-echo f | xcopy "$(SolutionDir)$(Configuration)\$(TargetName).pdb" "$(SolutionDir)Build\Win32\$(TargetName).pdb" /Y</Command>
+      <Command>echo f | xcopy "$(SolutionDir)$(Configuration)\$(TargetFileName)" "$(SolutionDir)Build\Win32\$(TargetFileName)" /Y</Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
diff --git a/P4Plugin/Source/P4Task.cpp b/P4Plugin/Source/P4Task.cpp
index a1cd20d..68727f6 100755
--- a/P4Plugin/Source/P4Task.cpp
+++ b/P4Plugin/Source/P4Task.cpp
@@ -433,7 +433,7 @@ bool P4Task::IsOnline()
 static std::string FormatFingerprintMessage(const std::string& statusMessage)
 {
 	std::string noNewlines = statusMessage;
-	for (int i = 0; i < noNewlines.size(); i++)
+	for (size_t i = 0; i < noNewlines.size(); i++)
 	{
 		if (noNewlines[i] == '\n')
 			noNewlines[i] = ' ';
diff --git a/Test/Source/TestServer.cpp b/Test/Source/TestServer.cpp
index 4b278a9..1657b2d 100644
--- a/Test/Source/TestServer.cpp
+++ b/Test/Source/TestServer.cpp
@@ -155,7 +155,7 @@ int run(int argc, char* argv[])
 	noresults = newbaseline;
 	verbose = argc > 4 ? std::string(argv[4]) == "verbose" && !newbaseline : false;
 	char buffer[4096];
-	char *answer = getcwd(buffer, sizeof(buffer));
+	char *answer = _getcwd(buffer, sizeof(buffer));
 	if (answer)
 	{
 		absroot = buffer;
@@ -289,7 +289,7 @@ static int runScript(ExternalProcess& p, const std::string& testDir, const std::
 			{
 				std::string delfile = command.substr(delfiletoken.length(), command.length() - 1 - delfiletoken.length());
 				// Delete a local file
-				unlink(delfile.c_str());
+				_unlink(delfile.c_str());
 				continue;
 			}
 			if (command.find(sleepToken) == 0)
diff --git a/Test/TestServer/TestServer.vcxproj b/Test/TestServer/TestServer.vcxproj
index f0c558f..1c31825 100644
--- a/Test/TestServer/TestServer.vcxproj
+++ b/Test/TestServer/TestServer.vcxproj
@@ -78,7 +78,7 @@
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <GenerateDebugInformation>false</GenerateDebugInformation>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
       <AdditionalDependencies>shlwapi.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>