diff --git a/libmbbootimg/include/mbbootimg/entry.h b/libmbbootimg/include/mbbootimg/entry.h index ec56278d9..c79bea38f 100644 --- a/libmbbootimg/include/mbbootimg/entry.h +++ b/libmbbootimg/include/mbbootimg/entry.h @@ -50,14 +50,14 @@ MB_DECLARE_OPERATORS_FOR_FLAGS(EntryTypes) class MB_EXPORT Entry { public: - Entry(EntryType type); - ~Entry(); + Entry(EntryType type) noexcept; + ~Entry() noexcept; MB_DEFAULT_COPY_CONSTRUCT_AND_ASSIGN(Entry) MB_DEFAULT_MOVE_CONSTRUCT_AND_ASSIGN(Entry) - bool operator==(const Entry &rhs) const; - bool operator!=(const Entry &rhs) const; + bool operator==(const Entry &rhs) const noexcept; + bool operator!=(const Entry &rhs) const noexcept; EntryType type() const; diff --git a/libmbbootimg/include/mbbootimg/format/android_reader_p.h b/libmbbootimg/include/mbbootimg/format/android_reader_p.h index 05881328d..75dbe783f 100644 --- a/libmbbootimg/include/mbbootimg/format/android_reader_p.h +++ b/libmbbootimg/include/mbbootimg/format/android_reader_p.h @@ -32,8 +32,8 @@ namespace mb::bootimg::android class AndroidFormatReader : public detail::FormatReader { public: - AndroidFormatReader(bool is_bump); - virtual ~AndroidFormatReader(); + AndroidFormatReader(bool is_bump) noexcept; + virtual ~AndroidFormatReader() noexcept; MB_DISABLE_COPY_CONSTRUCT_AND_ASSIGN(AndroidFormatReader) MB_DEFAULT_MOVE_CONSTRUCT_AND_ASSIGN(AndroidFormatReader) diff --git a/libmbbootimg/include/mbbootimg/format/android_writer_p.h b/libmbbootimg/include/mbbootimg/format/android_writer_p.h index 2a5037be3..f50664ba1 100644 --- a/libmbbootimg/include/mbbootimg/format/android_writer_p.h +++ b/libmbbootimg/include/mbbootimg/format/android_writer_p.h @@ -36,8 +36,8 @@ namespace mb::bootimg::android class AndroidFormatWriter : public detail::FormatWriter { public: - AndroidFormatWriter(bool is_bump); - virtual ~AndroidFormatWriter(); + AndroidFormatWriter(bool is_bump) noexcept; + virtual ~AndroidFormatWriter() noexcept; MB_DISABLE_COPY_CONSTRUCT_AND_ASSIGN(AndroidFormatWriter) MB_DEFAULT_MOVE_CONSTRUCT_AND_ASSIGN(AndroidFormatWriter) diff --git a/libmbbootimg/include/mbbootimg/format/loki_reader_p.h b/libmbbootimg/include/mbbootimg/format/loki_reader_p.h index 01b7e60e0..0d9de77d9 100644 --- a/libmbbootimg/include/mbbootimg/format/loki_reader_p.h +++ b/libmbbootimg/include/mbbootimg/format/loki_reader_p.h @@ -43,8 +43,8 @@ struct ReadHeaderResult class LokiFormatReader : public detail::FormatReader { public: - LokiFormatReader(); - virtual ~LokiFormatReader(); + LokiFormatReader() noexcept; + virtual ~LokiFormatReader() noexcept; MB_DISABLE_COPY_CONSTRUCT_AND_ASSIGN(LokiFormatReader) MB_DEFAULT_MOVE_CONSTRUCT_AND_ASSIGN(LokiFormatReader) diff --git a/libmbbootimg/include/mbbootimg/format/loki_writer_p.h b/libmbbootimg/include/mbbootimg/format/loki_writer_p.h index 256ca4e77..1b361679d 100644 --- a/libmbbootimg/include/mbbootimg/format/loki_writer_p.h +++ b/libmbbootimg/include/mbbootimg/format/loki_writer_p.h @@ -37,8 +37,8 @@ namespace mb::bootimg::loki class LokiFormatWriter : public detail::FormatWriter { public: - LokiFormatWriter(); - virtual ~LokiFormatWriter(); + LokiFormatWriter() noexcept; + virtual ~LokiFormatWriter() noexcept; MB_DISABLE_COPY_CONSTRUCT_AND_ASSIGN(LokiFormatWriter) MB_DEFAULT_MOVE_CONSTRUCT_AND_ASSIGN(LokiFormatWriter) diff --git a/libmbbootimg/include/mbbootimg/format/mtk_reader_p.h b/libmbbootimg/include/mbbootimg/format/mtk_reader_p.h index 443a1d6af..985732bb7 100644 --- a/libmbbootimg/include/mbbootimg/format/mtk_reader_p.h +++ b/libmbbootimg/include/mbbootimg/format/mtk_reader_p.h @@ -33,8 +33,8 @@ namespace mb::bootimg::mtk class MtkFormatReader : public detail::FormatReader { public: - MtkFormatReader(); - virtual ~MtkFormatReader(); + MtkFormatReader() noexcept; + virtual ~MtkFormatReader() noexcept; MB_DISABLE_COPY_CONSTRUCT_AND_ASSIGN(MtkFormatReader) MB_DEFAULT_MOVE_CONSTRUCT_AND_ASSIGN(MtkFormatReader) diff --git a/libmbbootimg/include/mbbootimg/format/mtk_writer_p.h b/libmbbootimg/include/mbbootimg/format/mtk_writer_p.h index 0158dc98e..51a5225dc 100644 --- a/libmbbootimg/include/mbbootimg/format/mtk_writer_p.h +++ b/libmbbootimg/include/mbbootimg/format/mtk_writer_p.h @@ -35,8 +35,8 @@ namespace mb::bootimg::mtk class MtkFormatWriter : public detail::FormatWriter { public: - MtkFormatWriter(); - virtual ~MtkFormatWriter(); + MtkFormatWriter() noexcept; + virtual ~MtkFormatWriter() noexcept; MB_DISABLE_COPY_CONSTRUCT_AND_ASSIGN(MtkFormatWriter) MB_DEFAULT_MOVE_CONSTRUCT_AND_ASSIGN(MtkFormatWriter) diff --git a/libmbbootimg/include/mbbootimg/format/segment_reader_p.h b/libmbbootimg/include/mbbootimg/format/segment_reader_p.h index 53ea93189..093c3d602 100644 --- a/libmbbootimg/include/mbbootimg/format/segment_reader_p.h +++ b/libmbbootimg/include/mbbootimg/format/segment_reader_p.h @@ -51,7 +51,7 @@ struct SegmentReaderEntry class SegmentReader { public: - SegmentReader(); + SegmentReader() noexcept; const std::vector & entries() const; oc::result set_entries(std::vector entries); diff --git a/libmbbootimg/include/mbbootimg/format/segment_writer_p.h b/libmbbootimg/include/mbbootimg/format/segment_writer_p.h index aea2fddba..e057d4e3f 100644 --- a/libmbbootimg/include/mbbootimg/format/segment_writer_p.h +++ b/libmbbootimg/include/mbbootimg/format/segment_writer_p.h @@ -51,7 +51,7 @@ struct SegmentWriterEntry struct SegmentWriter { public: - SegmentWriter(); + SegmentWriter() noexcept; const std::vector & entries() const; oc::result set_entries(std::vector entries); diff --git a/libmbbootimg/include/mbbootimg/format/sony_elf_reader_p.h b/libmbbootimg/include/mbbootimg/format/sony_elf_reader_p.h index 931e00e68..bddfa6d35 100644 --- a/libmbbootimg/include/mbbootimg/format/sony_elf_reader_p.h +++ b/libmbbootimg/include/mbbootimg/format/sony_elf_reader_p.h @@ -32,8 +32,8 @@ namespace mb::bootimg::sonyelf class SonyElfFormatReader : public detail::FormatReader { public: - SonyElfFormatReader(); - virtual ~SonyElfFormatReader(); + SonyElfFormatReader() noexcept; + virtual ~SonyElfFormatReader() noexcept; MB_DISABLE_COPY_CONSTRUCT_AND_ASSIGN(SonyElfFormatReader) MB_DEFAULT_MOVE_CONSTRUCT_AND_ASSIGN(SonyElfFormatReader) diff --git a/libmbbootimg/include/mbbootimg/format/sony_elf_writer_p.h b/libmbbootimg/include/mbbootimg/format/sony_elf_writer_p.h index 48f1af178..9d34ca3c6 100644 --- a/libmbbootimg/include/mbbootimg/format/sony_elf_writer_p.h +++ b/libmbbootimg/include/mbbootimg/format/sony_elf_writer_p.h @@ -35,8 +35,8 @@ namespace mb::bootimg::sonyelf class SonyElfFormatWriter : public detail::FormatWriter { public: - SonyElfFormatWriter(); - virtual ~SonyElfFormatWriter(); + SonyElfFormatWriter() noexcept; + virtual ~SonyElfFormatWriter() noexcept; MB_DISABLE_COPY_CONSTRUCT_AND_ASSIGN(SonyElfFormatWriter) MB_DEFAULT_MOVE_CONSTRUCT_AND_ASSIGN(SonyElfFormatWriter) diff --git a/libmbbootimg/include/mbbootimg/header.h b/libmbbootimg/include/mbbootimg/header.h index 361c265c6..8414b1216 100644 --- a/libmbbootimg/include/mbbootimg/header.h +++ b/libmbbootimg/include/mbbootimg/header.h @@ -78,14 +78,14 @@ constexpr HeaderFields ALL_FIELDS = class MB_EXPORT Header { public: - Header(); - ~Header(); + Header() noexcept; + ~Header() noexcept; MB_DEFAULT_COPY_CONSTRUCT_AND_ASSIGN(Header) MB_DEFAULT_MOVE_CONSTRUCT_AND_ASSIGN(Header) - bool operator==(const Header &rhs) const; - bool operator!=(const Header &rhs) const; + bool operator==(const Header &rhs) const noexcept; + bool operator!=(const Header &rhs) const noexcept; HeaderFields supported_fields() const; void set_supported_fields(HeaderFields fields); diff --git a/libmbbootimg/include/mbbootimg/reader.h b/libmbbootimg/include/mbbootimg/reader.h index 60951ba05..cb4671cf2 100644 --- a/libmbbootimg/include/mbbootimg/reader.h +++ b/libmbbootimg/include/mbbootimg/reader.h @@ -45,8 +45,8 @@ namespace bootimg class MB_EXPORT Reader { public: - Reader(); - ~Reader(); + Reader() noexcept; + ~Reader() noexcept; MB_DISABLE_COPY_CONSTRUCT_AND_ASSIGN(Reader) diff --git a/libmbbootimg/include/mbbootimg/reader_p.h b/libmbbootimg/include/mbbootimg/reader_p.h index d386b10de..8ec94dbd1 100644 --- a/libmbbootimg/include/mbbootimg/reader_p.h +++ b/libmbbootimg/include/mbbootimg/reader_p.h @@ -40,8 +40,8 @@ namespace bootimg::detail class FormatReader { public: - FormatReader(); - virtual ~FormatReader(); + FormatReader() noexcept; + virtual ~FormatReader() noexcept; MB_DISABLE_COPY_CONSTRUCT_AND_ASSIGN(FormatReader) MB_DEFAULT_MOVE_CONSTRUCT_AND_ASSIGN(FormatReader) diff --git a/libmbbootimg/include/mbbootimg/writer.h b/libmbbootimg/include/mbbootimg/writer.h index a13d867b1..8052aca8e 100644 --- a/libmbbootimg/include/mbbootimg/writer.h +++ b/libmbbootimg/include/mbbootimg/writer.h @@ -44,8 +44,8 @@ namespace bootimg class MB_EXPORT Writer { public: - Writer(); - ~Writer(); + Writer() noexcept; + ~Writer() noexcept; MB_DISABLE_COPY_CONSTRUCT_AND_ASSIGN(Writer) diff --git a/libmbbootimg/include/mbbootimg/writer_p.h b/libmbbootimg/include/mbbootimg/writer_p.h index 1888f92ae..557a5c823 100644 --- a/libmbbootimg/include/mbbootimg/writer_p.h +++ b/libmbbootimg/include/mbbootimg/writer_p.h @@ -39,8 +39,8 @@ namespace bootimg::detail class FormatWriter { public: - FormatWriter(); - virtual ~FormatWriter(); + FormatWriter() noexcept; + virtual ~FormatWriter() noexcept; MB_DISABLE_COPY_CONSTRUCT_AND_ASSIGN(FormatWriter) MB_DEFAULT_MOVE_CONSTRUCT_AND_ASSIGN(FormatWriter) diff --git a/libmbbootimg/src/entry.cpp b/libmbbootimg/src/entry.cpp index 0009cb14e..a088158cb 100644 --- a/libmbbootimg/src/entry.cpp +++ b/libmbbootimg/src/entry.cpp @@ -23,20 +23,20 @@ namespace mb::bootimg { -Entry::Entry(EntryType type) +Entry::Entry(EntryType type) noexcept : m_type(type) { } -Entry::~Entry() = default; +Entry::~Entry() noexcept = default; -bool Entry::operator==(const Entry &rhs) const +bool Entry::operator==(const Entry &rhs) const noexcept { return m_type == rhs.m_type && m_size == rhs.m_size; } -bool Entry::operator!=(const Entry &rhs) const +bool Entry::operator!=(const Entry &rhs) const noexcept { return !(*this == rhs); } diff --git a/libmbbootimg/src/format/android_reader.cpp b/libmbbootimg/src/format/android_reader.cpp index 406686403..53e5fe9b1 100644 --- a/libmbbootimg/src/format/android_reader.cpp +++ b/libmbbootimg/src/format/android_reader.cpp @@ -54,7 +54,7 @@ namespace std2 = std::experimental; namespace std2 = std; #endif -AndroidFormatReader::AndroidFormatReader(bool is_bump) +AndroidFormatReader::AndroidFormatReader(bool is_bump) noexcept : FormatReader() , m_is_bump(is_bump) , m_hdr() @@ -63,7 +63,7 @@ AndroidFormatReader::AndroidFormatReader(bool is_bump) { } -AndroidFormatReader::~AndroidFormatReader() = default; +AndroidFormatReader::~AndroidFormatReader() noexcept = default; Format AndroidFormatReader::type() { diff --git a/libmbbootimg/src/format/android_writer.cpp b/libmbbootimg/src/format/android_writer.cpp index 35a37d944..22f8d910f 100644 --- a/libmbbootimg/src/format/android_writer.cpp +++ b/libmbbootimg/src/format/android_writer.cpp @@ -44,7 +44,7 @@ namespace mb::bootimg::android { -AndroidFormatWriter::AndroidFormatWriter(bool is_bump) +AndroidFormatWriter::AndroidFormatWriter(bool is_bump) noexcept : FormatWriter() , m_is_bump(is_bump) , m_hdr() @@ -52,7 +52,7 @@ AndroidFormatWriter::AndroidFormatWriter(bool is_bump) { } -AndroidFormatWriter::~AndroidFormatWriter() = default; +AndroidFormatWriter::~AndroidFormatWriter() noexcept = default; Format AndroidFormatWriter::type() { diff --git a/libmbbootimg/src/format/loki_reader.cpp b/libmbbootimg/src/format/loki_reader.cpp index 785d7c3b8..e71042431 100644 --- a/libmbbootimg/src/format/loki_reader.cpp +++ b/libmbbootimg/src/format/loki_reader.cpp @@ -44,14 +44,14 @@ namespace mb::bootimg::loki { -LokiFormatReader::LokiFormatReader() +LokiFormatReader::LokiFormatReader() noexcept : FormatReader() , m_ahdr() , m_lhdr() { } -LokiFormatReader::~LokiFormatReader() = default; +LokiFormatReader::~LokiFormatReader() noexcept = default; Format LokiFormatReader::type() { diff --git a/libmbbootimg/src/format/loki_writer.cpp b/libmbbootimg/src/format/loki_writer.cpp index 172e0ba45..b74575448 100644 --- a/libmbbootimg/src/format/loki_writer.cpp +++ b/libmbbootimg/src/format/loki_writer.cpp @@ -47,14 +47,14 @@ namespace mb::bootimg::loki constexpr size_t MAX_ABOOT_SIZE = 2 * 1024 * 1024; -LokiFormatWriter::LokiFormatWriter() +LokiFormatWriter::LokiFormatWriter() noexcept : FormatWriter() , m_hdr() , m_sha_ctx() { } -LokiFormatWriter::~LokiFormatWriter() = default; +LokiFormatWriter::~LokiFormatWriter() noexcept = default; Format LokiFormatWriter::type() { diff --git a/libmbbootimg/src/format/mtk_reader.cpp b/libmbbootimg/src/format/mtk_reader.cpp index b67f667ec..055d82ef7 100644 --- a/libmbbootimg/src/format/mtk_reader.cpp +++ b/libmbbootimg/src/format/mtk_reader.cpp @@ -132,7 +132,7 @@ find_mtk_headers(File &file, const android::AndroidHeader &ahdr) }; } -MtkFormatReader::MtkFormatReader() +MtkFormatReader::MtkFormatReader() noexcept : FormatReader() , m_hdr() , m_mtk_kernel_hdr() @@ -140,7 +140,7 @@ MtkFormatReader::MtkFormatReader() { } -MtkFormatReader::~MtkFormatReader() = default; +MtkFormatReader::~MtkFormatReader() noexcept = default; Format MtkFormatReader::type() { diff --git a/libmbbootimg/src/format/mtk_writer.cpp b/libmbbootimg/src/format/mtk_writer.cpp index b5594d178..1da9a3d4b 100644 --- a/libmbbootimg/src/format/mtk_writer.cpp +++ b/libmbbootimg/src/format/mtk_writer.cpp @@ -133,13 +133,13 @@ _mtk_compute_sha1(SegmentWriter &seg, File &file, return oc::success(); } -MtkFormatWriter::MtkFormatWriter() +MtkFormatWriter::MtkFormatWriter() noexcept : FormatWriter() , m_hdr() { } -MtkFormatWriter::~MtkFormatWriter() = default; +MtkFormatWriter::~MtkFormatWriter() noexcept = default; Format MtkFormatWriter::type() { diff --git a/libmbbootimg/src/format/segment_reader.cpp b/libmbbootimg/src/format/segment_reader.cpp index e0ee48a94..1e950cfc0 100644 --- a/libmbbootimg/src/format/segment_reader.cpp +++ b/libmbbootimg/src/format/segment_reader.cpp @@ -36,7 +36,7 @@ namespace mb::bootimg { -SegmentReader::SegmentReader() +SegmentReader::SegmentReader() noexcept : m_state(SegmentReaderState::Begin) , m_entries() , m_entry(m_entries.end()) diff --git a/libmbbootimg/src/format/segment_writer.cpp b/libmbbootimg/src/format/segment_writer.cpp index 42a58cb52..98f755cdf 100644 --- a/libmbbootimg/src/format/segment_writer.cpp +++ b/libmbbootimg/src/format/segment_writer.cpp @@ -37,7 +37,7 @@ namespace mb::bootimg { -SegmentWriter::SegmentWriter() +SegmentWriter::SegmentWriter() noexcept : m_state(SegmentWriterState::Begin) , m_entries() , m_entry() diff --git a/libmbbootimg/src/format/sony_elf_reader.cpp b/libmbbootimg/src/format/sony_elf_reader.cpp index 35a1a429d..b5411e731 100644 --- a/libmbbootimg/src/format/sony_elf_reader.cpp +++ b/libmbbootimg/src/format/sony_elf_reader.cpp @@ -42,13 +42,13 @@ namespace mb::bootimg::sonyelf { -SonyElfFormatReader::SonyElfFormatReader() +SonyElfFormatReader::SonyElfFormatReader() noexcept : FormatReader() , m_hdr() { } -SonyElfFormatReader::~SonyElfFormatReader() = default; +SonyElfFormatReader::~SonyElfFormatReader() noexcept = default; Format SonyElfFormatReader::type() { diff --git a/libmbbootimg/src/format/sony_elf_writer.cpp b/libmbbootimg/src/format/sony_elf_writer.cpp index b8c763eb1..ea25270c3 100644 --- a/libmbbootimg/src/format/sony_elf_writer.cpp +++ b/libmbbootimg/src/format/sony_elf_writer.cpp @@ -41,7 +41,7 @@ namespace mb::bootimg::sonyelf { -SonyElfFormatWriter::SonyElfFormatWriter() +SonyElfFormatWriter::SonyElfFormatWriter() noexcept : FormatWriter() , m_hdr() , m_hdr_kernel() @@ -53,7 +53,7 @@ SonyElfFormatWriter::SonyElfFormatWriter() { } -SonyElfFormatWriter::~SonyElfFormatWriter() = default; +SonyElfFormatWriter::~SonyElfFormatWriter() noexcept = default; Format SonyElfFormatWriter::type() { diff --git a/libmbbootimg/src/header.cpp b/libmbbootimg/src/header.cpp index a94337549..9d1e5a198 100644 --- a/libmbbootimg/src/header.cpp +++ b/libmbbootimg/src/header.cpp @@ -37,14 +37,14 @@ namespace mb::bootimg { -Header::Header() +Header::Header() noexcept : m_fields_supported(ALL_FIELDS) { } -Header::~Header() = default; +Header::~Header() noexcept = default; -bool Header::operator==(const Header &rhs) const +bool Header::operator==(const Header &rhs) const noexcept { return m_kernel_addr == rhs.m_kernel_addr && m_ramdisk_addr == rhs.m_ramdisk_addr @@ -72,7 +72,7 @@ bool Header::operator==(const Header &rhs) const && m_hdr_entrypoint == rhs.m_hdr_entrypoint; } -bool Header::operator!=(const Header &rhs) const +bool Header::operator!=(const Header &rhs) const noexcept { return !(*this == rhs); } diff --git a/libmbbootimg/src/reader.cpp b/libmbbootimg/src/reader.cpp index 6035ea580..9b603ea57 100644 --- a/libmbbootimg/src/reader.cpp +++ b/libmbbootimg/src/reader.cpp @@ -183,9 +183,9 @@ namespace mb::bootimg using namespace detail; -FormatReader::FormatReader() = default; +FormatReader::FormatReader() noexcept = default; -FormatReader::~FormatReader() = default; +FormatReader::~FormatReader() noexcept = default; oc::result FormatReader::set_option(const char *key, const char *value) { @@ -211,7 +211,7 @@ oc::result FormatReader::go_to_entry(File &file, /*! * \brief Construct new Reader. */ -Reader::Reader() +Reader::Reader() noexcept : m_state(ReaderState::New) , m_owned_file() , m_file() @@ -226,7 +226,7 @@ Reader::Reader() * destructor, it is not possible to get the result of the close operation. To * get the result of the close operation, call Reader::close() manually. */ -Reader::~Reader() +Reader::~Reader() noexcept { (void) close(); } diff --git a/libmbbootimg/src/writer.cpp b/libmbbootimg/src/writer.cpp index 588632125..8d304c816 100644 --- a/libmbbootimg/src/writer.cpp +++ b/libmbbootimg/src/writer.cpp @@ -192,9 +192,9 @@ namespace mb::bootimg using namespace detail; -FormatWriter::FormatWriter() = default; +FormatWriter::FormatWriter() noexcept = default; -FormatWriter::~FormatWriter() = default; +FormatWriter::~FormatWriter() noexcept = default; oc::result FormatWriter::set_option(const char *key, const char *value) { @@ -224,7 +224,7 @@ oc::result FormatWriter::finish_entry(File &file) /*! * \brief Construct new Writer. */ -Writer::Writer() +Writer::Writer() noexcept : m_state(WriterState::New) , m_owned_file() , m_file() @@ -239,7 +239,7 @@ Writer::Writer() * destructor, it is not possible to get the result of the close operation. To * get the result of the close operation, call Writer::close() manually. */ -Writer::~Writer() +Writer::~Writer() noexcept { (void) close(); }