Browse Source

Use fixed-size type for permission entry indices

coverity_scan
Daniel Scharrer 12 years ago
parent
commit
0777efd4a7
  1. 4
      src/cli/debug.cpp
  2. 2
      src/setup/directory.cpp
  3. 2
      src/setup/directory.hpp
  4. 2
      src/setup/file.cpp
  5. 2
      src/setup/file.hpp

4
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);
}

2
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)) {

2
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;

2
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);

2
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;

Loading…
Cancel
Save