From 37a87f3b544c80d1d330992562441b5546df3c22 Mon Sep 17 00:00:00 2001
From: Zrax <zrax0111@gmail.com>
Date: Thu, 7 Apr 2011 15:09:09 -0700
Subject: [PATCH] Fix some more conformance difference related errors/warnings

---
 .../NucleusLib/pnUtils/Private/Win32/pnUtW32Uuid.cpp     | 4 ++--
 .../Plasma/NucleusLib/pnUtils/Private/pnUtBigNum.cpp     | 9 ++++++---
 .../Sources/Plasma/PubUtilLib/plFile/plFileUtils.cpp     | 2 +-
 .../Plasma/PubUtilLib/plStatusLog/plStatusLog.cpp        | 8 ++++----
 4 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnUtils/Private/Win32/pnUtW32Uuid.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnUtils/Private/Win32/pnUtW32Uuid.cpp
index b16b3714..7af83f02 100644
--- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnUtils/Private/Win32/pnUtW32Uuid.cpp
+++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnUtils/Private/Win32/pnUtW32Uuid.cpp
@@ -146,12 +146,12 @@ bool GuidIsNil (const Uuid & uuid) {
 const wchar * GuidToString (const Uuid & uuid, wchar * dst, unsigned chars) {
 	wchar * src;
 	RPC_STATUS s;
-	s = UuidToStringW( (GUID *) &uuid, &src );
+	s = UuidToStringW( (GUID *) &uuid, (RPC_WSTR*)&src );
 	if (RPC_S_OK == s)
         StrCopy(dst, src, chars);
     else
         StrCopy(dst, L"", chars);
-	RpcStringFreeW(&src);
+	RpcStringFreeW( (RPC_WSTR *)&src );
     return dst;
 }
 
diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnUtils/Private/pnUtBigNum.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnUtils/Private/pnUtBigNum.cpp
index 98d55f56..9a64b53d 100644
--- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnUtils/Private/pnUtBigNum.cpp
+++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnUtils/Private/pnUtBigNum.cpp
@@ -321,7 +321,8 @@ void BigNum::DivNormalized (const BigNum & a, const BigNum & b, BigNum * remaind
         if (quotient) {
             Val borrow = 0;
             Val carry  = 0;
-            for (unsigned denomIndex = 0; denomIndex != denomCount; ++denomIndex) {
+            unsigned denomIndex;
+            for (denomIndex = 0; denomIndex != denomCount; ++denomIndex) {
                 DVal product = (DVal)(Mul((*denom)[denomIndex], quotient) + carry);
                 carry = HIGH(product);
                 numer->SetVal(quotientIndex + denomIndex, (DVal)((DVal)(*numer)[quotientIndex + denomIndex] - (DVal)LOW(product) - (DVal)borrow), &borrow);
@@ -1297,7 +1298,8 @@ void BigNum::Sub (const BigNum & a, Val b) {
     const unsigned count = a.Count();
     SetCount(count);
     Val borrow = b;
-    for (unsigned index = 0; index < count; ++index) {
+    unsigned index;
+    for (index = 0; index < count; ++index) {
         SetVal(index, (DVal)((DVal)a[index] - (DVal)borrow), &borrow);
         borrow = (Val)((Val)0 - (Val)borrow);
     }
@@ -1314,7 +1316,8 @@ void BigNum::Sub (const BigNum & a, const BigNum & b) {
     const unsigned bCount = b.Count();
     GrowToCount(count, true);
     Val borrow = 0;
-    for (unsigned index = 0; index < count; ++index) {
+    unsigned index;
+    for (index = 0; index < count; ++index) {
         Val bVal = (index < bCount) ? b[index] : (Val)0;
         SetVal(index, (DVal)((DVal)a[index] - (DVal)bVal - (DVal)borrow), &borrow);
         borrow = (Val)((Val)0 - (Val)borrow);
diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plFile/plFileUtils.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plFile/plFileUtils.cpp
index b72615df..6336af88 100644
--- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plFile/plFileUtils.cpp
+++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plFile/plFileUtils.cpp
@@ -48,6 +48,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #include <time.h>
 #include <sys/types.h>
 #include <sys/stat.h>
+#include <errno.h>
 
 
 #if HS_BUILD_FOR_WIN32
@@ -57,7 +58,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 
 #if HS_BUILD_FOR_UNIX
 #include <unistd.h>
-#include <errno.h>
 #include <utime.h>
 #endif
 
diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plStatusLog/plStatusLog.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plStatusLog/plStatusLog.cpp
index 5ed3bdc3..39c188c2 100644
--- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plStatusLog/plStatusLog.cpp
+++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plStatusLog/plStatusLog.cpp
@@ -456,15 +456,15 @@ bool plStatusLog::IReOpen( void )
 			ext = L".elf";
 #endif
 		wchar fileToOpen[MAX_PATH];
-		swprintf(fileToOpen, L"%s.0%s", fileNoExt, ext);
+		swprintf(fileToOpen, MAX_PATH, L"%s.0%s", fileNoExt, ext);
 		if (!(fFlags & kDontRotateLogs))
 		{
 			wchar work[MAX_PATH], work2[MAX_PATH];
-			swprintf(work, L"%s.3%s",fileNoExt,ext);
+			swprintf(work, MAX_PATH, L"%s.3%s",fileNoExt,ext);
 			_wremove(work);
-			swprintf(work2, L"%s.2%s",fileNoExt,ext);
+			swprintf(work2, MAX_PATH, L"%s.2%s",fileNoExt,ext);
 			_wrename(work2, work);
-			swprintf(work, L"%s.1%s",fileNoExt,ext);
+			swprintf(work, MAX_PATH, L"%s.1%s",fileNoExt,ext);
 			_wrename(work, work2);
 			_wrename(fileToOpen, work);
 		}