X-Git-Url: http://git.tdb.fi/?p=libs%2Fcore.git;a=blobdiff_plain;f=source%2Fstringcodec%2Fexcept.cpp;h=23ac3cd64f8f48c6992600c6641b887924f27a73;hp=045f44af107613b5134cabde1245c17720b98da3;hb=acafbe566fb6f6b5592a2ec3dec667ba7cd3e7e4;hpb=c7afef88380ebebc8c2b04e48664d73281ec8848

diff --git a/source/stringcodec/except.cpp b/source/stringcodec/except.cpp
index 045f44a..23ac3cd 100644
--- a/source/stringcodec/except.cpp
+++ b/source/stringcodec/except.cpp
@@ -1,4 +1,5 @@
 #include <msp/strings/format.h>
+#include <msp/strings/utils.h>
 #include "except.h"
 
 using namespace std;
@@ -7,23 +8,19 @@ namespace Msp {
 namespace StringCodec {
 
 invalid_character::invalid_character(unichar ch, const string &detail):
-	codec_error(format("invalid character: U+%04X (%s)", ch, detail))
+	codec_error(format("U+%04X (%s)", ch, detail))
 { }
 
 
 invalid_sequence::invalid_sequence(const string::const_iterator &begin, const string::const_iterator &end, const string &detail):
-	codec_error(format("invalid sequence: %s (%s)", format_sequence(begin, end), detail))
+	codec_error(format("%s (%s)", format_sequence(begin, end), detail))
 { }
 
 string invalid_sequence::format_sequence(const string::const_iterator &begin, const string::const_iterator &end)
 {
 	string result;
 	for(string::const_iterator i=begin; i!=end; ++i)
-	{
-		if(!result.empty())
-			result += ' ';
-		result += lexical_cast(static_cast<unsigned char>(*i), Fmt().fill('0').width(2).hex().uppercase());
-	}
+		append(result, " ", lexical_cast<string>(static_cast<unsigned char>(*i), Fmt().fill('0').width(2).hex().uppercase()));
 	return result;
 }