From 29a722a7298744424b8dfe83e06abf04a75e9fea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=91=D1=80=D0=B0=D0=BD=D0=B8=D0=BC=D0=B8=D1=80=20=D0=9A?=
 =?UTF-8?q?=D0=B0=D1=80=D0=B0=D1=9F=D0=B8=D1=9B?=
 <branimirkaradzic@gmail.com>
Date: Sat, 8 Feb 2020 15:41:35 -0800
Subject: [PATCH] Cleanup.

---
 src/image.cpp               | 13 ++++++++++---
 tools/texturec/texturec.cpp | 12 +++++++-----
 2 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/src/image.cpp b/src/image.cpp
index e99ec3e..0184f0f 100644
--- a/src/image.cpp
+++ b/src/image.cpp
@@ -1287,8 +1287,13 @@ namespace bimg
 		bx::read(&reader, magic);
 
 		ImageContainer imageContainer;
-		if (magicT != magic
-		|| !parseFnT(imageContainer, &reader, _err) )
+		if (magicT != magic)
+		{
+			BX_ERROR_SET(_err, BIMG_ERROR, "Invalid header magic.");
+			return NULL;
+		}
+
+		if (!parseFnT(imageContainer, &reader, _err) )
 		{
 			return NULL;
 		}
@@ -3516,6 +3521,7 @@ namespace bimg
 		if (!_err->isOk()
 		||  headerSize < DDS_HEADER_SIZE)
 		{
+			BX_ERROR_SET(_err, BIMG_ERROR, "DDS: Invalid header size.");
 			return false;
 		}
 
@@ -3946,6 +3952,7 @@ namespace bimg
 		if (identifier[1] != '1'
 		&&  identifier[2] != '1')
 		{
+			BX_ERROR_SET(_err, BIMG_ERROR, "KTX: Unrecognized version.");
 			return false;
 		}
 
@@ -4036,7 +4043,7 @@ namespace bimg
 
 		if (TextureFormat::Unknown == format)
 		{
-			BX_ERROR_SET(_err, BIMG_ERROR, "Unrecognized image format.");
+			BX_ERROR_SET(_err, BIMG_ERROR, "KTX: Unrecognized image format.");
 			return false;
 		}
 
diff --git a/tools/texturec/texturec.cpp b/tools/texturec/texturec.cpp
index cc3a863..315f0e6 100644
--- a/tools/texturec/texturec.cpp
+++ b/tools/texturec/texturec.cpp
@@ -951,17 +951,19 @@ void help(const char* _error = NULL, bool _showHelp = true)
 		);
 }
 
-void help(const char* _str, const bx::Error& _err)
+void help(const bx::StringView _str, const bx::Error& _err)
 {
 	std::string str;
-	if (_str != NULL)
+	if (!_str.isEmpty() )
 	{
-		str.append(_str);
-		str.append(" ");
+		str.append(_str.getPtr(), _str.getTerm() - _str.getPtr() );
+		str.append(": ");
 	}
 
 	const bx::StringView& sv = _err.getMessage();
+	str.append("'");
 	str.append(sv.getPtr(), sv.getTerm() - sv.getPtr() );
+	str.append("'");
 
 	help(str.c_str(), false);
 }
@@ -1277,7 +1279,7 @@ int main(int _argc, const char* _argv[])
 
 			if (!err.isOk() )
 			{
-				help(NULL, err);
+				help("", err);
 				return bx::kExitFailure;
 			}
 		}