From 13941972442e111972b9feb343db33ab0890667b Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Wed, 19 Oct 2016 18:27:32 +0200
Subject: [PATCH] Silence more Clang warnings

---
 desmume/src/cheatSystem.cpp |  2 +-
 desmume/src/mc.cpp          | 21 ++++++++---------
 desmume/src/saves.cpp       | 46 ++++++++++++++++---------------------
 3 files changed, 31 insertions(+), 38 deletions(-)

diff --git a/desmume/src/cheatSystem.cpp b/desmume/src/cheatSystem.cpp
index 8b709b931..d88d9bf6d 100644
--- a/desmume/src/cheatSystem.cpp
+++ b/desmume/src/cheatSystem.cpp
@@ -98,7 +98,7 @@ void CHEATS::ARparser(CHEATS_LIST& list)
 
 		if (if_flag > 0) 
 		{
-			if ((type == 0x0E)) i += ((lo + 7) / 8);
+			if (type == 0x0E) i += ((lo + 7) / 8);
 			if ( (type == 0x0D) && (subtype == 0)) if_flag--;	// ENDIF
 			if ( (type == 0x0D) && (subtype == 2))				// NEXT & Flush
 			{
diff --git a/desmume/src/mc.cpp b/desmume/src/mc.cpp
index 6f52c75e4..874c3ddc2 100644
--- a/desmume/src/mc.cpp
+++ b/desmume/src/mc.cpp
@@ -162,17 +162,16 @@ bool BackupDevice::load_state(EMUFILE* is)
 	std::vector<u8> data;
 
 	if(read32le(&version,is)!=1) return false;
-	if(version>=0)
-	{
-		readbool(&write_enable,is);
-		read32le(&com,is);
-		read32le(&addr_size,is);
-		read32le(&addr_counter,is);
-		read32le(&temp,is);
-		state = (STATE)temp;
-		readbuffer(data,is);
-		readbuffer(data_autodetect,is);
-	}
+
+   readbool(&write_enable,is);
+   read32le(&com,is);
+   read32le(&addr_size,is);
+   read32le(&addr_counter,is);
+   read32le(&temp,is);
+   state = (STATE)temp;
+   readbuffer(data,is);
+   readbuffer(data_autodetect,is);
+
 	if(version>=1)
 		read32le(&addr,is);
 	
diff --git a/desmume/src/saves.cpp b/desmume/src/saves.cpp
index 905986455..eaab756b4 100644
--- a/desmume/src/saves.cpp
+++ b/desmume/src/saves.cpp
@@ -412,21 +412,18 @@ static bool s_slot1_loadstate(EMUFILE* is, int size)
 {
 	u32 version = is->read32le();
 
-	//version 0:
-	if(version >= 0)
-	{
-		u8 slotID = is->read32le();
-		slot1Type = NDS_SLOT1_RETAIL_AUTO;
-		if (version >= 1)
-			slot1_getTypeByID(slotID, slot1Type);
+	/* version 0: */
+   u8 slotID = is->read32le();
+   slot1Type = NDS_SLOT1_RETAIL_AUTO;
+   if (version >= 1)
+      slot1_getTypeByID(slotID, slot1Type);
 
-		slot1_Change(slot1Type);
+   slot1_Change(slot1Type);
 
-		EMUFILE_MEMORY temp;
-		is->readMemoryStream(&temp);
-		temp.fseek(0,SEEK_SET);
-		slot1_Loadstate(&temp);
-	}
+   EMUFILE_MEMORY temp;
+   is->readMemoryStream(&temp);
+   temp.fseek(0,SEEK_SET);
+   slot1_Loadstate(&temp);
 
 	return true;
 }
@@ -448,20 +445,17 @@ static bool s_slot2_loadstate(EMUFILE* is, int size)
 {
 	u32 version = is->read32le();
 
-	//version 0:
-	if(version >= 0)
-	{
-		slot2Type = NDS_SLOT2_AUTO;
-		u8 slotID = is->read32le();
-		if (version == 0)
-			slot2_getTypeByID(slotID, slot2Type);
-		slot2_Change(slot2Type);
+	/* version 0: */
+   slot2Type = NDS_SLOT2_AUTO;
+   u8 slotID = is->read32le();
+   if (version == 0)
+      slot2_getTypeByID(slotID, slot2Type);
+   slot2_Change(slot2Type);
 
-		EMUFILE_MEMORY temp;
-		is->readMemoryStream(&temp);
-		temp.fseek(0,SEEK_SET);
-		slot2_Loadstate(&temp);
-	}
+   EMUFILE_MEMORY temp;
+   is->readMemoryStream(&temp);
+   temp.fseek(0,SEEK_SET);
+   slot2_Loadstate(&temp);
 
 	return true;
 }