Fixed compiler warnings; other minor tweaks

Author: Towncivilian

MTADiag/Common.h

@@ -23,4 +23,4 @@
 #include <shlobj.h>
 #include "Log.h"
 
-#define VERSION "2.7.3"
+#define VERSION "2.7.4"

MTADiag/Curl.cpp

@@ -23,7 +23,6 @@ size_t write_data ( void *ptr, size_t size, size_t nmemb, void *stream ); // wri
 bool Curl::DownloadFile ( std::string fileURL, std::string filePath )
 {
 	CURL *curl; // initialize curl
-	CURLcode res; // variable to store curl result
 	curl = curl_easy_init(); // initialize curl_easy
 	if ( curl ) // if curl was initialized
 	{
@@ -35,20 +34,22 @@ bool Curl::DownloadFile ( std::string fileURL, std::string filePath )
 		curl_easy_setopt ( curl, CURLOPT_WRITEDATA, fp ); // set the file path
 		curl_easy_setopt ( curl, CURLOPT_NOPROGRESS, FALSE ); // we want progress
 		curl_easy_setopt ( curl, CURLOPT_PROGRESSFUNCTION, progress_callback ); // set the progress callback function
-		res = curl_easy_perform ( curl ); // perform; store result into res
+		CURLcode res = curl_easy_perform ( curl ); // perform; store result into res
 		curl_easy_cleanup ( curl ); // clean up
 		fclose ( fp ); // close the file
-	}
-	if ( !res ) // if we were successful
+
+		if ( !res ) // if we were successful
 		return true;
-	else // failure
+		else // failure
+		return false;
+	}
+	else // failure to initialize CURL
 		return false;
 }
 
 std::string Curl::CreatePasteBin ( std::string filePath, std::string pasteName )
 {
 	CURL *curl; // initialize curl
-	CURLcode res; // variable to store curl result
 	curl = curl_easy_init(); // initialize curl_easy
 
 	std::string logText; // stores entire log file
@@ -92,17 +93,22 @@ std::string Curl::CreatePasteBin ( std::string filePath, std::string pasteName )
 		curl_easy_setopt ( curl, CURLOPT_NOPROGRESS, FALSE ); // we want progress
 		curl_easy_setopt ( curl, CURLOPT_PROGRESSFUNCTION, progress_callback ); // set the progress callback function
 		curl_easy_setopt ( curl, CURLOPT_WRITEFUNCTION, write_data ); // set the write function
-		res = curl_easy_perform ( curl ); // perform; store result into res
+		CURLcode res = curl_easy_perform ( curl ); // perform; store result into res
 		curl_easy_cleanup ( curl ); // clean up
-	}
-	if ( !res ) // if we were successful
-	{
 
-		return response;
+		if ( !res ) // if we were successful
+		{
+
+			return response;
+		}
+		else // failure
+		{
+			return "Failed to upload to Pastebin.";
+		}
 	}
-	else // failure
+	else
 	{
-		return "Failed to upload to Pastebin.";
+		return "Failed to initialize CURL.";
 	}
 }
 

MTADiag/Diag.cpp

@@ -66,7 +66,6 @@ void Diag::Begin ( void )
 				std::cout << "Missing GTA file: " << fileList[i].szFilename << std::endl; // output any messed up file
 				bQuit = true; // we need to quit since the user's GTA install is probably screwed up
 			}
-			std::cout << szFilename << std::endl;
 			printf ( "Checking %i out of %i...\r", i, ( sizeof ( fileList ) / sizeof ( fileList[0] ) ) );
 			fflush ( stdout );
     }
@@ -125,6 +124,8 @@ void Diag::Begin ( void )
 	Log::WriteStringToLog ( "" );
 
 	// check for any modified or nonstandard GTA files
+	std::cout << "Checking for modified or nonstandard GTA files, please wait..." << std::endl;
+
 	for ( unsigned int i = 0; i < ( sizeof ( fileList ) / sizeof ( fileList[0] ) ); i++ )
     {
 			std::string szMd5 = fileList[i].szMd5;
@@ -240,9 +241,9 @@ void Diag::Cleanup ( bool deleteLog )
 void Diag::GeneratePaths ( void )
 {
 	// obtain Temp and WINDOWS environment variables, and store system time
-	tempDir = getenv ( "Temp" );                        // get the Temp directory
-	systemRoot = getenv ( "SystemRoot" );	            // get the WINDOWS directory
-	programData = getenv ( "AllUsersProfile" );         // get the ProgramData directory 
+	tempDir = GetEnv ( "Temp" );                        // get the Temp directory
+	systemRoot = GetEnv ( "SystemRoot" );	            // get the WINDOWS directory
+	programData = GetEnv ( "AllUsersProfile" );         // get the ProgramData directory 
 	IsWow64Process ( GetCurrentProcess(), &bIsWOW64 );  // is MTADiag running under WOW64?
 	GetLocalTime ( &sysTime );                          // get the current system time
 	bQuit = false;                                      // initialize quit bool, used in GTA files checking