From b9c776eb254db1970e1fe313fcb3a433511a4dd2 Mon Sep 17 00:00:00 2001
From: Mark Cannon <vyhdycokio@gmail.com>
Date: Sun, 19 Sep 2010 09:53:51 +0000
Subject: [PATCH] sync DiagnosticsUtil with trunk

git-svn-id: https://openitg.svn.sourceforge.net/svnroot/openitg/branches/dev@825 83fadc84-e282-4d84-a09a-c4228d6ae7e5
---
 src/DiagnosticsUtil.cpp | 62 +++++++++++++++++++++++++++----------------------
 src/DiagnosticsUtil.h   |  5 ++--
 2 files changed, 37 insertions(+), 30 deletions(-)

diff --git a/src/DiagnosticsUtil.cpp b/src/DiagnosticsUtil.cpp
index 466804b9..e50a143d 100644
--- a/src/DiagnosticsUtil.cpp
+++ b/src/DiagnosticsUtil.cpp
@@ -55,35 +55,35 @@ namespace
 	unsigned KILOBYTE = 1024;
 	unsigned MEGABYTE = 1024*KILOBYTE;
 	unsigned GIGABYTE = 1024*MEGABYTE;
-}
-
-CString FormatByteValue( uint64_t iBytes )
-{
-	double fShownSpace = 0.0f;
-	CString sSuffix;
 
-	if( iBytes > GIGABYTE )
-	{
-		fShownSpace = iBytes / GIGABYTE;
-		sSuffix = "GB";
-	}
-	else if( iBytes > MEGABYTE )
-	{
-		fShownSpace = iBytes / MEGABYTE;
-		sSuffix = "MB";
-	}
-	else if( iBytes > KILOBYTE )
-	{
-		fShownSpace = iBytes / KILOBYTE;
-		sSuffix = "KB";
-	}
-	else
+	CString FormatByteValue( uint64_t iBytes )
 	{
-		fShownSpace = double(iBytes);
-		sSuffix = "bytes";
-	}
+		CString sSuffix;
+		double fShownSpace = 0.0f;
+
+		if( iBytes > GIGABYTE )
+		{
+			fShownSpace = iBytes / GIGABYTE;
+			sSuffix = "GB";
+		}
+		else if( iBytes > MEGABYTE )
+		{
+			fShownSpace = iBytes / MEGABYTE;
+			sSuffix = "MB";
+		}
+		else if( iBytes > KILOBYTE )
+		{
+			fShownSpace = iBytes / KILOBYTE;
+			sSuffix = "KB";
+		}
+		else
+		{
+			fShownSpace = double(iBytes);
+			sSuffix = "bytes";
+		}
 
-	return ssprintf( "%.02f %s", fShownSpace, sSuffix.c_str() );
+		return ssprintf( "%.02f %s", fShownSpace, sSuffix.c_str() );
+	}
 }
 
 // XXX: we should probably take a parameter for these later on.
@@ -179,6 +179,11 @@ CString DiagnosticsUtil::GetProductName()
 	return CString(PRODUCT_NAME_VER);
 }
 
+CString DiagnosticsUtil::GetProductVer()
+{
+	return CString(PRODUCT_VER);
+}
+
 namespace
 {
 	/* this allows us to use the serial numbers on home builds for
@@ -276,14 +281,15 @@ LuaFunction_NoArgs( GetNumIOErrors,		ITGIO::m_iInputErrorCount );
 LuaFunction_NoArgs( GetDiskSpaceFree,		DiagnosticsUtil::GetDiskSpaceFree() );
 LuaFunction_NoArgs( GetDiskSpaceTotal,		DiagnosticsUtil::GetDiskSpaceTotal() );
 
-// product name function
+// versioning functions
+LuaFunction_NoArgs( GetRevision,		DiagnosticsUtil::GetRevision() );
 LuaFunction_NoArgs( GetProductName,		DiagnosticsUtil::GetProductName() );
+LuaFunction_NoArgs( GetProductVer,		DiagnosticsUtil::GetProductVer() );
 
 // diagnostics enumeration functions
 LuaFunction_NoArgs( GetNumCrashLogs,		DiagnosticsUtil::GetNumCrashLogs() );
 LuaFunction_NoArgs( GetNumMachineScores,	DiagnosticsUtil::GetNumMachineScores() );
 LuaFunction_NoArgs( GetNumMachineEdits, 	DiagnosticsUtil::GetNumMachineEdits() );
-LuaFunction_NoArgs( GetRevision,		DiagnosticsUtil::GetRevision() );
 
 // arcade diagnostics
 LuaFunction_NoArgs( GetIP,			DiagnosticsUtil::GetIP() );
diff --git a/src/DiagnosticsUtil.h b/src/DiagnosticsUtil.h
index c3bcf48a..da7d4698 100644
--- a/src/DiagnosticsUtil.h
+++ b/src/DiagnosticsUtil.h
@@ -8,17 +8,18 @@ namespace DiagnosticsUtil
 	int GetNumCrashLogs();
 	int GetNumMachineEdits();
 	int GetNumMachineScores();
-	int GetRevision();
 
 	CString GetDiskSpaceFree();
 	CString GetDiskSpaceTotal();
 
-	CString GetIP();
 	CString GetProductName();
+	CString GetProductVer();
+	int GetRevision();
 
 	CString GetInputType();
 	void SetInputType( const CString &sType );
 
+	CString GetIP();
 	CString GetSerialNumber();
 
 	bool HubIsConnected();
-- 
2.11.0