Minor tweaks

Author: Towncivilian

MTADiag/Common.h

@@ -22,4 +22,4 @@
 #include <vector>
 #include "Log.h"
 
-#define VERSION "2.4"
+#define VERSION "2.4.1"

MTADiag/Curl.cpp

@@ -105,14 +105,14 @@ std::string Curl::CreatePasteBin ( std::string filePath, std::string pasteName )
 	}
 }
 
-void progress_callback ( void* percent, double TotalToDL, double CurrentDL, double TotalToUL, double CurrentUL )
+void progress_callback ( void*, double TotalToDL, double CurrentDL, double TotalToUL, double CurrentUL )
 {
 	if ( TotalToDL > 0 ) { printf ( "Downloaded: %3.0f%%\r", CurrentDL/TotalToDL * 100 ); }
 	else { printf ( "Uploaded: %3.0f%%\r", CurrentUL/TotalToUL * 100 ); }
 	fflush ( stdout );
 }
 
-size_t write_data ( void* ptr, size_t size, size_t nmemb, void* stream )
+size_t write_data ( void* ptr, size_t size, size_t nmemb, void* )
 {
 	std::string temp ( static_cast <const char*> ( ptr ), size* nmemb );
     Curl::response.append ( temp );

MTADiag/Curl.h

@@ -12,8 +12,8 @@
 * 
 *****************************************************************************/ 
 
-#ifndef CCURL_H
-#define CCURL_H
+#pragma once
+
 #include "Common.h"
 
 namespace Curl {
@@ -22,6 +22,4 @@ namespace Curl {
 	std::string           CreatePasteBin          ( std::string filePath, std::string pasteName );
 
 	static std::string    response;               // HTTP POST response
-}
-
-#endif
+}

MTADiag/Diag.cpp

@@ -65,7 +65,7 @@ void Diag::Begin ( void )
 
 	std::string DirectXState = ( CheckForFile ( files[4] ) ) ? "Yes" : "No";
 	Log::WriteStringToLog ( "DirectX up-to-date:   ", DirectXState );
-	if ( DXUpdated == 0 )
+	if ( DXUpdated == 1 )
 		Log::WriteStringToLog ( "DirectX was updated:   Yes");
 
 	if ( CompatRemoved1 == true || CompatRemoved2 == true )

MTADiag/Log.h

@@ -12,8 +12,7 @@
 * 
 *****************************************************************************/ 
 
-#ifndef LOG_H
-#define LOG_H
+#pragma once
 
 #include "Common.h"
 
@@ -26,6 +25,4 @@ namespace Log {
 	void                    WriteStringToLog            ( std::string string, std::string string2 = "", bool endline = true );
 
 	static std::ofstream    logfile;
-}
-
-#endif
+}

MTADiag/util.cpp

@@ -103,8 +103,8 @@ bool DeleteCompatibilityEntries ( std::string subkey, HKEY hKeyType )
 				}
 			}
 		}
-		return changed;
 		RegCloseKey ( hKey ); // close the registry key
+		return changed;
 	}
 	else
 	{
@@ -147,7 +147,7 @@ bool IsVistaOrNewer ( void )
 
 	GetVersionEx ( &osvi );
 
-	if ( bIsVistaOrNewer = ( osvi.dwMajorVersion >= 6 ) )
+	if ( ( bIsVistaOrNewer = ( osvi.dwMajorVersion >= 6 ) ) != 0 )
 		return true;
 	else
 		return false;
@@ -164,7 +164,7 @@ bool IsWin8OrNewer ( void )
 
 	GetVersionEx ( &osvi );
 
-	if ( bIsWin8OrNewer = ( osvi.dwMajorVersion >= 6 && osvi.dwMinorVersion >= 2 )  )
+	if ( ( bIsWin8OrNewer = ( osvi.dwMajorVersion >= 6 && osvi.dwMinorVersion >= 2 ) ) != 0 )
 		return true;
 	else
 		return false;