finished dialogs for memory checks and breakpoints

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

2 files changed, 5 insertions, 4 deletions

diff --git a/Source/Core/Common/Src/StringUtil.cpp b/Source/Core/Common/Src/StringUtil.cpp
index 7df5164698..882a811077 100644
--- a/Source/Core/Common/Src/StringUtil.cpp
+++ b/Source/Core/Common/Src/StringUtil.cpp
@@ -22,7 +22,7 @@
 #include "TestFramework.h"

 

 // faster than sscanf

-u32 AsciiToHex(const char* _szValue)

+bool AsciiToHex(const char* _szValue, u32& result)

 {

 	u32 value = 0;

 	size_t finish = strlen(_szValue);

@@ -126,12 +126,13 @@ u32 AsciiToHex(const char* _szValue)
 			    break;

 

 		    default:

-			    value >>= 4;

+			    return false;

 			    break;

 		}

 	}

 

-	return(value);

+	result = value;

+	return (true);

 }

 

 

diff --git a/Source/Core/Common/Src/StringUtil.h b/Source/Core/Common/Src/StringUtil.h
index c700d9bdc2..bc6496d198 100644
--- a/Source/Core/Common/Src/StringUtil.h
+++ b/Source/Core/Common/Src/StringUtil.h
@@ -60,7 +60,7 @@ bool TryParseUInt(const std::string& str, u32* output);
 

 

 // TODO: kill this

-u32 AsciiToHex(const char* ascii);

+bool AsciiToHex(const char* _szValue, u32& result);

 

 void SplitString(const std::string& str, const std::string& delim, std::vector<std::string>& output);

 int ChooseStringFrom(const char* str, const char* * items);