From 62b27e62773b40f3922c6a7a24d9b095f2beb187 Mon Sep 17 00:00:00 2001
From: Rene Gollent <anevilyak@gmail.com>
Date: Mon, 16 Sep 2013 21:28:19 +0200
Subject: [PATCH] Fix previous format problem more correctly.

Thanks Ingo, Oliver and Ithamar for the hint.
---
 .../user_interface/gui/inspector_window/MemoryView.cpp | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/apps/debugger/user_interface/gui/inspector_window/MemoryView.cpp b/src/apps/debugger/user_interface/gui/inspector_window/MemoryView.cpp
index 4f2979d951..9a3947c7cf 100644
--- a/src/apps/debugger/user_interface/gui/inspector_window/MemoryView.cpp
+++ b/src/apps/debugger/user_interface/gui/inspector_window/MemoryView.cpp
@@ -184,9 +184,7 @@ MemoryView::Draw(BRect rect)
 			for (int32 j = 0; j < currentBlocksPerLine; j++) {
 				const char* blockAddress = currentAddress + (j
 					* blockByteSize);
-				_GetNextHexBlock(buffer,
-					std::min((size_t)hexBlockSize, sizeof(buffer)),
-					blockAddress);
+				_GetNextHexBlock(buffer, sizeof(buffer), blockAddress);
 				DrawString(buffer, drawPoint);
 				if (targetAddress >= blockAddress && targetAddress <
 					blockAddress + blockByteSize) {
@@ -581,7 +579,8 @@ MemoryView::_GetNextHexBlock(char* buffer, int32 bufferSize,
 	switch(fHexMode) {
 		case HexMode8BitInt:
 		{
-			snprintf(buffer, bufferSize, "%02" B_PRIx8, *address);
+			snprintf(buffer, bufferSize, "%02" B_PRIx8,
+				*((const uint8*)address));
 			break;
 		}
 		case HexMode16BitInt:
@@ -802,8 +801,7 @@ MemoryView::_GetSelectedText(BString& text)
 
 	char buffer[32];
 	for (int32 i = 0; i < count; i++) {
-		_GetNextHexBlock(buffer, std::min(_GetHexDigitsPerBlock() + 1,
-				(int32)32),	data);
+		_GetNextHexBlock(buffer, sizeof(buffer), data);
 		data += blockSize;
 		text << buffer;
 		if (i < count - 1)