Fix more cppcheck warnings/errors; some code formatting; and fixes to our tools

svn-id: r44539

4 files changed, 5 insertions, 8 deletions

diff --git a/tools/create_kyradat/create_kyradat.cpp b/tools/create_kyradat/create_kyradat.cpp
index 5bcdaa4228..1dff394d43 100644
--- a/tools/create_kyradat/create_kyradat.cpp
+++ b/tools/create_kyradat/create_kyradat.cpp
@@ -1063,8 +1063,6 @@ bool process(PAKFile &out, const Game *g, const byte *data, const uint32 size) {
 
 bool setupSearch(const int *needList, Search &search, DataIdList &dataIdList) {
 	for (const int *entry = needList; *entry != -1; ++entry) {
-		bool found = false;
-
 		ExtractEntryList providers = getProvidersForId(*entry);
 
 		if (providers.empty()) {
diff --git a/tools/create_kyradat/games.cpp b/tools/create_kyradat/games.cpp
index ebea422557..a3413abd55 100644
--- a/tools/create_kyradat/games.cpp
+++ b/tools/create_kyradat/games.cpp
@@ -880,7 +880,7 @@ const GameNeed gameNeedTable[] = {
 	{ kLol, kPlatformPC, kTalkieFile1, lolCDFile1Need },
 	{ kLol, kPlatformPC, kTalkieFile2, lolCDFile2Need },
 
-	{ -1, -1, 0 }
+	{ -1, -1, -1, 0 }
 };
 
 } // end of anonymous namespace
diff --git a/tools/create_kyradat/search.h b/tools/create_kyradat/search.h
index 8ec8c7017e..e5cd65b297 100644
--- a/tools/create_kyradat/search.h
+++ b/tools/create_kyradat/search.h
@@ -65,8 +65,6 @@ private:
 
 	typedef std::map<uint32, uint32> SumMap;
 	SumMap _sums;
-	typedef std::map<uint32, uint> SumCount;
-	SumCount _sumCount;
 };
 
 class Search {
diff --git a/tools/create_kyradat/util.h b/tools/create_kyradat/util.h
index 0b5e729a05..7c044ae04f 100644
--- a/tools/create_kyradat/util.h
+++ b/tools/create_kyradat/util.h
@@ -53,9 +53,10 @@ typedef signed short int16;
 typedef signed int int32;
 
 #if !defined(__cplusplus)
-typedef uint8 bool;
-#define false 0
-#define true 1
+enum bool {
+	false = 0,
+	true = 1
+};
 
 /* If your C compiler doesn't support 'inline', please add a check for it. */
 #if defined(_MSC_VER)