some cleanup

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1303 8ced0084-cf51-0410-be5f-012b33b47a6e

4 files changed, 13 insertions, 15 deletions

diff --git a/Source/Core/Common/Src/FileUtil.cpp b/Source/Core/Common/Src/FileUtil.cpp
index 73ae338ded..e3401387ac 100644
--- a/Source/Core/Common/Src/FileUtil.cpp
+++ b/Source/Core/Common/Src/FileUtil.cpp
@@ -274,8 +274,8 @@ u32 ScanDirectoryTree(const std::string& _Directory, FSTEntry& parentEntry)
 u32 ScanDirectoryTree(const std::string& _Directory, FSTEntry& parentEntry)

 {

     PanicAlert("Scan directory not implemanted yet\n");

-	// TODO - Insert linux stuff here

-	return 0;

+    // TODO - Insert linux stuff here

+    return 0;

 }

 #endif

 

diff --git a/Source/Core/Core/Src/HW/CommandProcessor.cpp b/Source/Core/Core/Src/HW/CommandProcessor.cpp
index 6ffc1f2609..28bb2a5037 100644
--- a/Source/Core/Core/Src/HW/CommandProcessor.cpp
+++ b/Source/Core/Core/Src/HW/CommandProcessor.cpp
@@ -377,7 +377,7 @@ void Write16(const u16 _Value, const u32 _Address)
 				" - The good news is, the time you read that message, the fifo should be empty now :p\n"

 				" - Anyway, fifo flush will be forced if you press OK and dolphin might continue to work...\n"

 				" - We aren't betting on that :)", fifo.CPReadWriteDistance);

-			/**/

+                        */

 			LOG(COMMANDPROCESSOR, "*********************** GXSetGPFifo very soon? ***********************");

 			u32 ct=0;

 			while (fifo.bFF_GPReadEnable && fifo.CPReadWriteDistance > 0 )

@@ -406,7 +406,7 @@ void Write16(const u16 _Value, const u32 _Address)
 			//fifo.bFF_Breakpoint = m_CPStatusReg.Breakpoint;

 			fifo.bFF_Breakpoint = m_CPStatusReg.Breakpoint	? true : false;

 			//LOG(COMMANDPROCESSOR,"fifo.bFF_Breakpoint : %i",fifo.bFF_Breakpoint);

-			/**/

+			*/

 

 			// update interrupts

 			UpdateInterrupts();

@@ -449,7 +449,7 @@ void Write16(const u16 _Value, const u32 _Address)
 					m_CPStatusReg.Breakpoint = 0;

 					InterlockedExchange((LONG*)&fifo.bFF_Breakpoint,	0);

 				}

-			}/**/

+			}*/

 			m_CPCtrlReg.Hex = tmpCtrl.Hex;

 			UpdateInterrupts();

 			LOG(COMMANDPROCESSOR,"\t write to CTRL_REGISTER : %04x", _Value);

@@ -617,7 +617,7 @@ void GatherPipeBursted()
 

 			LOG(COMMANDPROCESSOR, "(GatherPipeBursted): CPHiWatermark reached");

 			// Wait for GPU to catch up

-			while (!(fifo.bFF_BPEnable && fifo.bFF_Breakpoint) && fifo.CPReadWriteDistance > (s32)fifo.CPLoWatermark)

+			while (!(fifo.bFF_BPEnable && fifo.bFF_Breakpoint) && fifo.CPReadWriteDistance > fifo.CPLoWatermark)

 			{

 				ct++;

 				// dunno if others threads (like the audio thread) really need a forced context switch here

diff --git a/Source/Core/DiscIO/Src/BannerLoaderWii.cpp b/Source/Core/DiscIO/Src/BannerLoaderWii.cpp
index 6eb9602cec..0eae9fd877 100644
--- a/Source/Core/DiscIO/Src/BannerLoaderWii.cpp
+++ b/Source/Core/DiscIO/Src/BannerLoaderWii.cpp
@@ -75,7 +75,7 @@ CBannerLoaderWii::GetBanner(u32* _pBannerImage)
 {

 	if (!IsValid())

 	{

-		return(false);

+		return false;

 	}

 

 	SWiiBanner* pBanner = (SWiiBanner*)m_pBannerFile;

@@ -93,7 +93,7 @@ CBannerLoaderWii::GetBanner(u32* _pBannerImage)
 	}

 

 

-	return(true);

+	return true;

 }

 

 std::string 

@@ -126,15 +126,15 @@ CBannerLoaderWii::GetName(std::string& _rName, int language)
 		return true;

 	}

 

-	_rName = m_Name;

-	return(true);

+	return true;

 }

 

 

 bool

 CBannerLoaderWii::GetCompany(std::string& _rCompany)

 {

-	return(false);

+    _rCompany = "N/A";

+    return true;

 }

 

 

@@ -150,7 +150,7 @@ CBannerLoaderWii::GetDescription(std::string& _rDescription)
 		return true;

 	}

 

-	return(false);

+	return false;

 }

 

 

@@ -197,7 +197,7 @@ CBannerLoaderWii::decode5A3(u16 val)
 		a = 0xFF;

 	}

 

-	return((a << 24) | (r << 16) | (g << 8) | b);

+	return ((a << 24) | (r << 16) | (g << 8) | b);

 }

 

 

diff --git a/Source/Core/DiscIO/Src/BannerLoaderWii.h b/Source/Core/DiscIO/Src/BannerLoaderWii.h
index d0f253bcfe..48efa2b875 100644
--- a/Source/Core/DiscIO/Src/BannerLoaderWii.h
+++ b/Source/Core/DiscIO/Src/BannerLoaderWii.h
@@ -66,8 +66,6 @@ class CBannerLoaderWii
 		int lut4to8[16];

 		int lut5to8[32];

 

-		std::string m_Name;

-

 		u8* m_pBannerFile;

 

 		bool m_IsValid;