From cdbee3c26c1488c6cc893e42b16e10c36848691d Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Tue, 18 May 2021 21:21:00 -0700 Subject: [PATCH] clang-tidy: init in member initializer Found with cppcoreguidelines-prefer-member-initializer Signed-off-by: Rosen Penev --- samples/geotag.cpp | 23 +++++++---------------- src/basicio.cpp | 11 +++++------ src/bmffimage.cpp | 6 +++--- src/ini.cpp | 3 +-- src/makernote_int.cpp | 4 +--- src/preview.cpp | 15 +++++---------- 6 files changed, 22 insertions(+), 40 deletions(-) diff --git a/samples/geotag.cpp b/samples/geotag.cpp index 417291bc..a1fbce7c 100644 --- a/samples/geotag.cpp +++ b/samples/geotag.cpp @@ -98,23 +98,14 @@ char* realpath(const char* file,char* path) // Command-line parser class Options { public: - bool verbose; - bool help; - bool version; - bool dst; - bool dryrun; - bool ascii; - - Options() - { - verbose = false; - help = false; - version = false; - dst = false; - dryrun = false; - ascii = false; - } + bool verbose{false}; + bool help{false}; + bool version{false}; + bool dst{false}; + bool dryrun{false}; + bool ascii{false}; + Options() = default; virtual ~Options() = default; } ; diff --git a/src/basicio.cpp b/src/basicio.cpp index 6e792584..420a6154 100644 --- a/src/basicio.cpp +++ b/src/basicio.cpp @@ -1456,13 +1456,14 @@ namespace Exiv2 { const std::string XPathIo::TEMP_FILE_EXT = ".exiv2_temp"; const std::string XPathIo::GEN_FILE_EXT = ".exiv2"; - XPathIo::XPathIo(const std::string& orgPath) : FileIo(XPathIo::writeDataToFile(orgPath)) { - isTemp_ = true; + XPathIo::XPathIo(const std::string& orgPath) : FileIo(XPathIo::writeDataToFile(orgPath)), isTemp_(true) + { tempFilePath_ = path(); } #ifdef EXV_UNICODE_PATH - XPathIo::XPathIo(const std::wstring& wOrgPathpath) : FileIo(XPathIo::writeDataToFile(wOrgPathpath)) { + XPathIo::XPathIo(const std::wstring& wOrgPathpath) : FileIo(XPathIo::writeDataToFile(wOrgPathpath)), isTemp_(true) + { isTemp_ = true; tempFilePath_ = path(); } @@ -2222,10 +2223,8 @@ namespace Exiv2 { long timeout_; //!< The number of seconds to wait while trying to connect. }; // class RemoteIo::Impl - CurlIo::CurlImpl::CurlImpl(const std::string& url, size_t blockSize):Impl(url, blockSize) + CurlIo::CurlImpl::CurlImpl(const std::string& url, size_t blockSize) : Impl(url, blockSize), curl_(curl_easy_init()) { - // init curl pointer - curl_ = curl_easy_init(); if(!curl_) { throw Error(kerErrorMessage, "Uable to init libcurl."); } diff --git a/src/bmffimage.cpp b/src/bmffimage.cpp index 935c220a..804800eb 100644 --- a/src/bmffimage.cpp +++ b/src/bmffimage.cpp @@ -101,12 +101,12 @@ namespace Exiv2 } BmffImage::BmffImage(BasicIo::UniquePtr io, bool /* create */) - : Image(ImageType::bmff, mdExif | mdIptc | mdXmp, std::move(io)) - , endian_(Exiv2::bigEndian) + : Image(ImageType::bmff, mdExif | mdIptc | mdXmp, std::move(io)), + endian_(Exiv2::bigEndian), + bReadMetadata_(false) { pixelWidth_ = 0; pixelHeight_ = 0; - bReadMetadata_ = false; } // BmffImage::BmffImage std::string BmffImage::toAscii(long n) diff --git a/src/ini.cpp b/src/ini.cpp index 7b66f441..b36693e5 100755 --- a/src/ini.cpp +++ b/src/ini.cpp @@ -228,9 +228,8 @@ int Exiv2::ini_parse(const char* filename, ini_handler handler, void* user) return error; } -INIReader::INIReader(const std::string &filename) +INIReader::INIReader(const std::string& filename) : _error(ini_parse(filename.c_str(), ValueHandler, this)) { - _error = ini_parse(filename.c_str(), ValueHandler, this); } int INIReader::ParseError() const diff --git a/src/makernote_int.cpp b/src/makernote_int.cpp index faff7cac..82e4a4e0 100644 --- a/src/makernote_int.cpp +++ b/src/makernote_int.cpp @@ -422,12 +422,10 @@ namespace Exiv2 { return sizeof(signature_); } - Nikon3MnHeader::Nikon3MnHeader() + Nikon3MnHeader::Nikon3MnHeader() : byteOrder_(invalidByteOrder), start_(sizeOfSignature()) { buf_.alloc(sizeOfSignature()); std::memcpy(buf_.pData_, signature_, buf_.size_); - byteOrder_ = invalidByteOrder; - start_ = sizeOfSignature(); } uint32_t Nikon3MnHeader::size() const diff --git a/src/preview.cpp b/src/preview.cpp index 7f3d047c..d713369e 100644 --- a/src/preview.cpp +++ b/src/preview.cpp @@ -518,10 +518,8 @@ namespace { return true; } - LoaderExifJpeg::LoaderExifJpeg(PreviewId id, const Image &image, int parIdx) - : Loader(id, image) + LoaderExifJpeg::LoaderExifJpeg(PreviewId id, const Image &image, int parIdx) : Loader(id, image), offset_(0) { - offset_ = 0; const ExifData &exifData = image_.exifData(); auto pos = exifData.findKey(ExifKey(param_[parIdx].offsetKey_)); if (pos != exifData.end() && pos->count() > 0) { @@ -1031,10 +1029,9 @@ namespace { // ***************************************************************************** // class member definitions namespace Exiv2 { - PreviewImage::PreviewImage(PreviewProperties properties, DataBuf data) : properties_(std::move(properties)) + PreviewImage::PreviewImage(PreviewProperties properties, DataBuf data) + : properties_(std::move(properties)), pData_(data.pData_), size_(data.size_) { - pData_ = data.pData_; - size_ = data.size_; std::pair ret = data.release(); UNUSED(ret); } @@ -1044,12 +1041,10 @@ namespace Exiv2 { delete[] pData_; } - PreviewImage::PreviewImage(const PreviewImage& rhs) + PreviewImage::PreviewImage(const PreviewImage &rhs) + : properties_(rhs.properties_), pData_(new byte[rhs.size_]), size_(rhs.size_) { - properties_ = rhs.properties_; - pData_ = new byte[rhs.size_]; memcpy(pData_, rhs.pData_, rhs.size_); - size_ = rhs.size_; } PreviewImage& PreviewImage::operator=(const PreviewImage& rhs)