From 19984031f68c9faaebdb09104f095cebde514f8e Mon Sep 17 00:00:00 2001
From: lioncash <mathew1900@hotmail.com>
Date: Tue, 29 Jan 2013 09:03:22 -0500
Subject: [PATCH] These two variables should be unsigned. It doesn't make sense
 for them to be signed.

I'm pretty sure having a negative maximum allowable text output limit wouldn't happen.
Also, I'm pretty sure an output length won't be negative.

These also get rid of some typecasts.
---
 Core/Dialog/PSPOskDialog.cpp | 16 ++++++++--------
 Core/Dialog/PSPOskDialog.h   |  4 ++--
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/Core/Dialog/PSPOskDialog.cpp b/Core/Dialog/PSPOskDialog.cpp
index 666b1c7f09..5655a7737b 100644
--- a/Core/Dialog/PSPOskDialog.cpp
+++ b/Core/Dialog/PSPOskDialog.cpp
@@ -102,7 +102,7 @@ void PSPOskDialog::RenderKeyboard()
 	char temp[2];
 	temp[1] = '\0';
 
-	int limit = oskData.outtextlimit;
+	u32 limit = oskData.outtextlimit;
 	// TODO: Test more thoroughly.  Encountered a game where this was 0.
 	if (limit <= 0)
 		limit = 16;
@@ -112,10 +112,10 @@ void PSPOskDialog::RenderKeyboard()
 	float title = (480.0f - (7.0f * limit)) / 2.0f;
 
 	PPGeDrawText(oskDesc.c_str(), title , 20, PPGE_ALIGN_CENTER, 0.5f, CalcFadedColor(0xFFFFFFFF));
-	for (int i = 0; i < limit; ++i)
+	for (u32 i = 0; i < limit; ++i)
 	{
 		u32 color = CalcFadedColor(0xFFFFFFFF);
-		if (i < (int) inputChars.size())
+		if (i < inputChars.size())
 			temp[0] = inputChars[i];
 		else if (i == inputChars.size())
 		{
@@ -151,7 +151,7 @@ int PSPOskDialog::Update()
 	int selectedRow = selectedChar / KEYSPERROW;
 	int selectedExtra = selectedChar % KEYSPERROW;
 
-	int limit = oskData.outtextlimit;
+	u32 limit = oskData.outtextlimit;
 	// TODO: Test more thoroughly.  Encountered a game where this was 0.
 	if (limit <= 0)
 		limit = 16;
@@ -201,7 +201,7 @@ int PSPOskDialog::Update()
 
 		if (IsButtonPressed(CTRL_CROSS))
 		{
-			if ((int) inputChars.size() < limit)
+			if (inputChars.size() < limit)
 				inputChars += oskKeys[selectedRow][selectedExtra];
 		}
 		else if (IsButtonPressed(CTRL_CIRCLE))
@@ -220,15 +220,15 @@ int PSPOskDialog::Update()
 		status = SCE_UTILITY_STATUS_SHUTDOWN;
 	}
 
-	for (int i = 0; i < limit; ++i)
+	for (u32 i = 0; i < limit; ++i)
 	{
 		u16 value = 0;
-		if (i < (int) inputChars.size())
+		if (i < inputChars.size())
 			value = 0x0000 ^ inputChars[i];
 		Memory::Write_U16(value, oskData.outtextPtr + (2 * i));
 	}
 
-	oskData.outtextlength = (int) inputChars.size();
+	oskData.outtextlength = inputChars.size();
 	oskParams.base.result= 0;
 	oskData.result = PSP_UTILITY_OSK_RESULT_CHANGED;
 	Memory::WriteStruct(oskParams.SceUtilityOskDataPtr, &oskData);
diff --git a/Core/Dialog/PSPOskDialog.h b/Core/Dialog/PSPOskDialog.h
index 1683edf040..23ea7859f0 100644
--- a/Core/Dialog/PSPOskDialog.h
+++ b/Core/Dialog/PSPOskDialog.h
@@ -115,13 +115,13 @@ typedef struct _SceUtilityOskData
 	/** Initial text */
 	u32 intextPtr;
 	/** Length of output text */
-	int outtextlength;
+	u32 outtextlength;
 	/** Pointer to the output text */
 	u32 outtextPtr;
 	/** Result. One of ::SceUtilityOskResult */
 	int result;
 	/** The max text that can be input */
-	int outtextlimit;
+	u32 outtextlimit;
 
 } SceUtilityOskData;