From 0777efd4a742ffd786e0656f586fa55331f169ff Mon Sep 17 00:00:00 2001
From: Daniel Scharrer <daniel@constexpr.org>
Date: Thu, 15 May 2014 20:39:02 +0200
Subject: [PATCH] Use fixed-size type for permission entry indices

---
 src/cli/debug.cpp       | 4 ++--
 src/setup/directory.cpp | 2 +-
 src/setup/directory.hpp | 2 +-
 src/setup/file.cpp      | 2 +-
 src/setup/file.hpp      | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/cli/debug.cpp b/src/cli/debug.cpp
index ba3dc48..9b46793 100644
--- a/src/cli/debug.cpp
+++ b/src/cli/debug.cpp
@@ -216,7 +216,7 @@ static void print_entry(const setup::info & info, size_t i,
 	}
 	
 	std::cout << if_not_zero("  Attributes", entry.attributes);
-	std::cout << if_not_equal("  Permission entry", entry.permission, -1);
+	std::cout << if_not_equal("  Permission entry", entry.permission, boost::int16_t(-1));
 	std::cout << if_not_zero("  Options", entry.options);
 }
 
@@ -241,7 +241,7 @@ static void print_entry(const setup::info & info, size_t i,
 	
 	std::cout << if_not_zero("  Attributes", entry.attributes);
 	std::cout << if_not_zero("  Size", entry.external_size);
-	std::cout << if_not_equal("  Permission entry", entry.permission, -1);
+	std::cout << if_not_equal("  Permission entry", entry.permission, boost::int16_t(-1));
 	std::cout << if_not_zero("  Options", entry.options);
 	std::cout << if_not_equal("  Type", entry.type, setup::file_entry::UserFile);
 }
diff --git a/src/setup/directory.cpp b/src/setup/directory.cpp
index 901eaa7..a5554c0 100644
--- a/src/setup/directory.cpp
+++ b/src/setup/directory.cpp
@@ -72,7 +72,7 @@ void directory_entry::load(std::istream & is, const version & version) {
 	if(version >= INNO_VERSION(4, 1, 0)) {
 		permission = util::load<boost::int16_t>(is);
 	} else {
-		permission = -1;
+		permission = boost::int16_t(-1);
 	}
 	
 	if(version >= INNO_VERSION(5, 2, 0)) {
diff --git a/src/setup/directory.hpp b/src/setup/directory.hpp
index 54e0bbd..27ace91 100644
--- a/src/setup/directory.hpp
+++ b/src/setup/directory.hpp
@@ -49,7 +49,7 @@ struct directory_entry : public item {
 	
 	boost::uint32_t attributes;
 	
-	int permission; //!< index into the permission entry list
+	boost::int16_t permission; //!< index into the permission entry list
 	
 	flags options;
 	
diff --git a/src/setup/file.cpp b/src/setup/file.cpp
index 7f2cb9e..0107f2f 100644
--- a/src/setup/file.cpp
+++ b/src/setup/file.cpp
@@ -111,7 +111,7 @@ void file_entry::load(std::istream & is, const version & version) {
 	if(version >= INNO_VERSION(4, 1, 0)) {
 		permission = util::load<boost::int16_t>(is);
 	} else {
-		permission = -1;
+		permission = boost::int16_t(-1);
 	}
 	
 	stored_flag_reader<flags> flagreader(is, version.bits);
diff --git a/src/setup/file.hpp b/src/setup/file.hpp
index e96dc72..6f3eea1 100644
--- a/src/setup/file.hpp
+++ b/src/setup/file.hpp
@@ -90,7 +90,7 @@ struct file_entry : public item {
 	boost::uint32_t attributes;
 	boost::uint64_t external_size;
 	
-	int permission; //!< index into the permission entry list
+	boost::int16_t permission; //!< index into the permission entry list
 	
 	flags options;