From 57a88d2e3f8634d96c719394f2b7bd6187b00bdc Mon Sep 17 00:00:00 2001 From: DasBlub Date: Sat, 16 Oct 2010 15:35:44 +0200 Subject: [PATCH] [10613] A bit of cleanup in ByteBuffer::hexlike --- src/shared/ByteBuffer.h | 37 ++++++------------------------------- src/shared/revision_nr.h | 2 +- 2 files changed, 7 insertions(+), 32 deletions(-) diff --git a/src/shared/ByteBuffer.h b/src/shared/ByteBuffer.h index 9e0ff7a58..1919a862c 100644 --- a/src/shared/ByteBuffer.h +++ b/src/shared/ByteBuffer.h @@ -446,48 +446,23 @@ class ByteBuffer { if ((i == (j * 8)) && ((i != (k * 16)))) { - if (read(i) < 0x10) - { - sLog.outDebugInLine("| 0%X ", read(i) ); - } - else - { - sLog.outDebugInLine("| %X ", read(i) ); - } + sLog.outDebugInLine("| %02X ", read(i)); ++j; } else if (i == (k * 16)) { - if (read(i) < 0x10) - { - sLog.outDebugInLine("\n"); - if(sLog.IsIncludeTime()) - sLog.outDebugInLine(" "); + sLog.outDebugInLine("\n"); + if(sLog.IsIncludeTime()) + sLog.outDebugInLine(" "); - sLog.outDebugInLine("0%X ", read(i) ); - } - else - { - sLog.outDebugInLine("\n"); - if(sLog.IsIncludeTime()) - sLog.outDebugInLine(" "); - - sLog.outDebugInLine("%X ", read(i) ); - } + sLog.outDebugInLine("%02X ", read(i)); ++k; ++j; } else { - if (read(i) < 0x10) - { - sLog.outDebugInLine("0%X ", read(i) ); - } - else - { - sLog.outDebugInLine("%X ", read(i) ); - } + sLog.outDebugInLine("%02X ", read(i)); } } sLog.outDebugInLine("\n"); diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index 5c371c600..b9711fb25 100644 --- a/src/shared/revision_nr.h +++ b/src/shared/revision_nr.h @@ -1,4 +1,4 @@ #ifndef __REVISION_NR_H__ #define __REVISION_NR_H__ - #define REVISION_NR "10612" + #define REVISION_NR "10613" #endif // __REVISION_NR_H__