Cleanup

Author: romainthomas

api/python/src/ELF/objects/pyDynamicEntryRpath.cpp

@@ -48,7 +48,7 @@ void create<DynamicEntryRpath>(nb::module_& m) {
  [] (const DynamicEntryRpath& obj) {
  return LIEF::py::safe_string(obj.rpath());
  },
- nb::overload_cast<const std::string&>(&DynamicEntryRpath::rpath),
+ nb::overload_cast<std::string>(&DynamicEntryRpath::rpath),
  "The actual rpath as a string"_doc)
 
  .def_prop_rw("paths",

api/python/src/PE/objects/resources/pyResourceVarFileInfo.cpp

@@ -48,7 +48,7 @@ void create<ResourceVarFileInfo>(nb::module_& m) {
 
  .def_prop_rw("translations",
  nb::overload_cast<>(&ResourceVarFileInfo::translations),
- nb::overload_cast<const std::vector<uint32_t>&>(&ResourceVarFileInfo::translations),
+ nb::overload_cast<std::vector<uint32_t>>(&ResourceVarFileInfo::translations),
  R"delim(
  List of languages that the application supports
 

include/LIEF/ELF/DynamicEntryRpath.hpp

@@ -59,7 +59,7 @@ class LIEF_API DynamicEntryRpath : public DynamicEntry {
  return rpath_;
  }
 
- void rpath(const std::string& name) {
+ void rpath(std::string name) {
  rpath_ = std::move(name);
  }
 
@@ -71,7 +71,7 @@ class LIEF_API DynamicEntryRpath : public DynamicEntry {
  DynamicEntryRpath& insert(size_t pos, const std::string& path);
 
  //! Append the given ``path``
- DynamicEntryRpath& append(const std::string& path);
+ DynamicEntryRpath& append(std::string path);
 
  //! Remove the given ``path``
  DynamicEntryRpath& remove(const std::string& path);

include/LIEF/PE/resources/ResourceVarFileInfo.hpp

@@ -16,13 +16,13 @@
 #ifndef LIEF_PE_RESOURCE_VAR_FILE_INFO_H
 #define LIEF_PE_RESOURCE_VAR_FILE_INFO_H
 #include <ostream>
-#include <sstream>
 #include <cstdint>
 #include <vector>
 
 #include "LIEF/visibility.h"
 
 #include "LIEF/Object.hpp"
+
 namespace LIEF {
 namespace PE {
 
@@ -42,41 +42,57 @@ class LIEF_API ResourceVarFileInfo : public Object {
  public:
  ResourceVarFileInfo();
  ResourceVarFileInfo(uint16_t type, std::u16string key);
- ResourceVarFileInfo(const ResourceVarFileInfo&);
- ResourceVarFileInfo& operator=(const ResourceVarFileInfo&);
- ~ResourceVarFileInfo() override;
+ ResourceVarFileInfo(const ResourceVarFileInfo&) = default;
+ ResourceVarFileInfo& operator=(const ResourceVarFileInfo&) = default;
+ ~ResourceVarFileInfo() override = default;
 
  //! The type of data in the version resource
  //! * ``1`` if it contains text data
  //! * ``0`` if it contains binary data
- uint16_t type() const;
+ uint16_t type() const {
+ return type_;
+ }
 
  //! Signature of the structure:
  //! Must be the unicode string "VarFileInfo"
- const std::u16string& key() const;
+ const std::u16string& key() const {
+ return key_;
+ }
 
  //! List of languages that the application supports
  //!
  //! The **least** significant 16-bits must contain a Microsoft language identifier,
  //! and the **most** significant 16-bits must contain the PE::CODE_PAGES
  //! Either **most** or **least** 16-bits can be zero, indicating that the file is language or code page independent.
- const std::vector<uint32_t>& translations() const;
- std::vector<uint32_t>& translations();
+ const std::vector<uint32_t>& translations() const {
+ return translations_;
+ }
+
+ std::vector<uint32_t>& translations() {
+ return translations_;
+ }
+
+ void type(uint16_t type) {
+ type_ = type;
+ }
 
- void type(uint16_t type);
+ void key(std::u16string key) {
+ key_ = std::move(key);
+ }
 
- void key(const std::u16string& key);
  void key(const std::string& key);
 
- void translations(const std::vector<uint32_t>& translations);
+ void translations(std::vector<uint32_t> translations) {
+ translations_ = std::move(translations);
+ }
 
  void accept(Visitor& visitor) const override;
 
 
  LIEF_API friend std::ostream& operator<<(std::ostream& os, const ResourceVarFileInfo& entry);
 
  private:
- uint16_t  type_ = 0;
+ uint16_t type_ = 0;
  std::u16string key_;
  std::vector<uint32_t> translations_;
 

include/LIEF/PE/signature/Signature.hpp

@@ -47,6 +47,7 @@ class LIEF_API Signature : public Object {
  static std::vector<uint8_t> hash(const std::vector<uint8_t>& input, ALGORITHMS algo) {
  return hash(input.data(), input.size(), algo);
  }
+
  static std::vector<uint8_t> hash(const uint8_t* buffer, size_t size, ALGORITHMS algo);
 
  public:

include/LIEF/PE/signature/SignatureParser.hpp

@@ -68,8 +68,8 @@ class LIEF_API SignatureParser {
  SignatureParser& operator=(const SignatureParser&) = delete;
  private:
 
- ~SignatureParser();
- SignatureParser();
+ ~SignatureParser() = default;
+ SignatureParser() = default;
 
  static result<Signature> parse_signature(BinaryStream& stream);
 

include/LIEF/iterators.hpp

@@ -79,7 +79,7 @@ class ref_iterator {
  return *this;
  }
 
- void swap(ref_iterator& other) {
+ void swap(ref_iterator& other) noexcept {
  std::swap(const_cast<add_lvalue_reference_t<remove_const_t<DT>>>(container_),
  const_cast<add_lvalue_reference_t<remove_const_t<DT>>>(other.container_));
  std::swap(it_, other.it_);
@@ -330,7 +330,7 @@ class filter_iterator {
  return *this;
  }
 
- void swap(filter_iterator& other) {
+ void swap(filter_iterator& other) noexcept {
  std::swap(const_cast<remove_const_t<DT>&>(container_), const_cast<remove_const_t<DT>&>(other.container_));
  std::swap(it_, other.it_);
  std::swap(filters_, other.filters_);

src/ELF/DynamicEntryRpath.cpp

@@ -44,9 +44,9 @@ void DynamicEntryRpath::paths(const std::vector<std::string>& paths) {
  });
 }
 
-DynamicEntryRpath& DynamicEntryRpath::append(const std::string& path) {
+DynamicEntryRpath& DynamicEntryRpath::append(std::string path) {
  std::vector<std::string> paths = this->paths();
- paths.push_back(path);
+ paths.push_back(std::move(path));
  this->paths(paths);
  return *this;
 }

src/ELF/ObjectFileLayout.hpp

@@ -21,7 +21,8 @@
 #include <LIEF/ELF/Section.hpp>
 #include <LIEF/ELF/Symbol.hpp>
 #include <LIEF/iostream.hpp>
-#include <ELF/DataHandler/Handler.hpp>
+
+#include "ELF/DataHandler/Handler.hpp"
 
 #include "logging.hpp"
 #include "Layout.hpp"

src/MachO/DyldChainedFixups.cpp

@@ -116,7 +116,7 @@ std::ostream& DyldChainedFixups::print(std::ostream& os) const {
 
  if (const auto* lib = bind.library()) {
  libname = lib->name();
- auto pos = libname.rfind("/");
+ auto pos = libname.rfind('/');
  if (pos != std::string::npos) {
  libname = libname.substr(pos + 1);
  }