From 27079ceb9a031f63d2285ffb7cf5aff35112d8e2 Mon Sep 17 00:00:00 2001
From: "SND\\MaddTheSane_cp"
 <SND\MaddTheSane_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97>
Date: Fri, 6 Jun 2014 23:12:44 +0000
Subject: OS X: minor code changes and improvements.

git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@90607 e17a0e51-4ae3-4d35-97c3-1a29b211df97
---
 macosx/PcsxrMemCardArray.m | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

(limited to 'macosx/PcsxrMemCardArray.m')

diff --git a/macosx/PcsxrMemCardArray.m b/macosx/PcsxrMemCardArray.m
index 3570b74c..57de81ae 100644
--- a/macosx/PcsxrMemCardArray.m
+++ b/macosx/PcsxrMemCardArray.m
@@ -97,8 +97,7 @@ static inline void ClearMemcardData(char *to, int dsti, char *str)
 	if (self = [super init]) {
 		NSMutableArray *tmpMemArray = [[NSMutableArray alloc] initWithCapacity:MAX_MEMCARD_BLOCKS];
 		cardNumber = carNum;
-		int i, x;
-		i = 0;
+		int i = 0, x;
 		while (i < MAX_MEMCARD_BLOCKS) {
 			x = 1;
 			McdBlock memBlock;
@@ -202,7 +201,7 @@ static inline void ClearMemcardData(char *to, int dsti, char *str)
 	
 	int memIdx = tmpObj.startingIndex;
 	for (int i = 0; i < memSize; i++) {
-		CopyMemcardData([self memDataPtr], [otherCard memDataPtr], (memIdx+i), (toCopy+i), (char*)otherCard.memCardCPath);
+		CopyMemcardData([self memDataPtr], [otherCard memDataPtr], memIdx + i, toCopy + i, (char*)otherCard.memCardCPath);
 	}
 	
 	return YES;
@@ -275,18 +274,18 @@ static inline void ClearMemcardData(char *to, int dsti, char *str)
 		
 		if (theFlags == memFlagDeleted || theFlags == memFlagFree) {
 			PCSXRMemFlags up1Flags = theFlags;
-			while ((up1Flags == memFlagDeleted || up1Flags == memFlagFree) && x < MAX_MEMCARD_BLOCKS){
+			while ((up1Flags == memFlagDeleted || up1Flags == memFlagFree) && x < MAX_MEMCARD_BLOCKS) {
 				x++;
 				McdBlock up1Block;
 				GetMcdBlockInfo(cardNumber, x+1, &up1Block);
 				up1Flags = [PcsxrMemoryObject memFlagsFromBlockFlags:up1Block.Flags];
 			}
 			if (x >= MAX_MEMCARD_BLOCKS) {
-				
 				break;
 			}
+			
 			CopyMemcardData(self.memDataPtr, self.memDataPtr, x, i, (char*)[[self.memCardURL path] fileSystemRepresentation]);
-			ClearMemcardData(self.memDataPtr, x, (char*)self.memCardCPath );
+			ClearMemcardData(self.memDataPtr, x, (char*)self.memCardCPath);
 		}
 		i++;
 	}
@@ -322,7 +321,7 @@ static inline void ClearMemcardData(char *to, int dsti, char *str)
 	
 	McdBlock flagBlock;
 	
-	for(i = theObj.startingIndex +1; i < (theObj.startingIndex + theObj.blockSize +1); i++)
+	for(i = theObj.startingIndex + 1; i < (theObj.startingIndex + theObj.blockSize + 1); i++)
 	{
 		GetMcdBlockInfo(cardNumber, i, &flagBlock);
 		ptr = data + i * 128;
-- 
cgit v1.2.3