From 9f41c30443374ed06b1f28cb261552bd34bb885e Mon Sep 17 00:00:00 2001 From: Martchus Date: Tue, 31 Oct 2023 20:05:13 +0100 Subject: [PATCH] Silence/fix GCC's maybe-uninitialized warnings * The warning about `bsEnvCount` is actually correct. * The warning about `lastAtomToBeWritten` might be correct. * The warning about `relPos` is definitely unjustified because `relPos` is only used when `cueRelativePositionElement` is not `nullptr` and `relPos` is initialized in that case. * The warnings about `pos`, `nextPageOffset` and `startOfLastMetaDataBlock` are also wrong for similar reasons. --- aac/aacframe.cpp | 2 +- matroska/matroskacontainer.cpp | 2 +- matroska/matroskacues.cpp | 2 +- mediafileinfo.cpp | 2 +- mp4/mp4container.cpp | 2 +- ogg/oggcontainer.cpp | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/aac/aacframe.cpp b/aac/aacframe.cpp index 50b4d5b..5e2cd26 100644 --- a/aac/aacframe.cpp +++ b/aac/aacframe.cpp @@ -955,7 +955,7 @@ std::int16_t AacFrameElementParser::sbrHuffmanDec(SbrHuffTab table) void AacFrameElementParser::parseSbrGrid(std::shared_ptr &sbr, std::uint8_t channel) { - std::uint8_t tmp, bsEnvCount; + std::uint8_t tmp, bsEnvCount = 0; //byte bsRelCount0, bsRelCount1; switch ((sbr->bsFrameClass[channel] = m_reader.readBits(2))) { using namespace BsFrameClasses; diff --git a/matroska/matroskacontainer.cpp b/matroska/matroskacontainer.cpp index c9189a9..9307ea6 100644 --- a/matroska/matroskacontainer.cpp +++ b/matroska/matroskacontainer.cpp @@ -88,7 +88,7 @@ void MatroskaContainer::validateIndex(Diagnostics &diag, AbortableProgressFeedba unordered_set ids; bool cueTimeFound = false, cueTrackPositionsFound = false; unique_ptr clusterElement; - std::uint64_t pos, prevClusterSize = 0, currentOffset = 0; + auto pos = std::uint64_t(), prevClusterSize = std::uint64_t(), currentOffset = std::uint64_t(); // iterate through all segments for (EbmlElement *segmentElement = m_firstElement->siblingById(MatroskaIds::Segment, diag); segmentElement; segmentElement = segmentElement->siblingById(MatroskaIds::Segment, diag)) { diff --git a/matroska/matroskacues.cpp b/matroska/matroskacues.cpp index 55d269e..6f5006e 100644 --- a/matroska/matroskacues.cpp +++ b/matroska/matroskacues.cpp @@ -78,7 +78,7 @@ void MatroskaCuePositionUpdater::parse(EbmlElement *cuesElement, Diagnostics &di cuePointElementSize += cuePointChild->totalSize(); break; case MatroskaIds::CueTrackPositions: - cueTrackPositionsElementSize = 0; + cueTrackPositionsElementSize = relPos = 0; cueRelativePositionElement = cueClusterPositionElement = nullptr; for (EbmlElement *cueTrackPositionsChild = cuePointChild->firstChild(); cueTrackPositionsChild; cueTrackPositionsChild = cueTrackPositionsChild->nextSibling()) { diff --git a/mediafileinfo.cpp b/mediafileinfo.cpp index d9f4815..ad90439 100644 --- a/mediafileinfo.cpp +++ b/mediafileinfo.cpp @@ -1717,7 +1717,7 @@ void MediaFileInfo::makeMp3File(Diagnostics &diag, AbortableProgressFeedback &pr std::uint32_t streamOffset; // where the actual stream starts stringstream flacMetaData(ios_base::in | ios_base::out | ios_base::binary); flacMetaData.exceptions(ios_base::badbit | ios_base::failbit); - std::streamoff startOfLastMetaDataBlock; + auto startOfLastMetaDataBlock = std::streamoff(); if (flacStream) { // if it is a raw FLAC stream, make FLAC metadata startOfLastMetaDataBlock = flacStream->makeHeader(flacMetaData, diag); diff --git a/mp4/mp4container.cpp b/mp4/mp4container.cpp index 975abb3..995c816 100644 --- a/mp4/mp4container.cpp +++ b/mp4/mp4container.cpp @@ -269,7 +269,7 @@ void Mp4Container::internalMakeFile(Diagnostics &diag, AbortableProgressFeedback // find relevant atoms in original file Mp4Atom *fileTypeAtom, *progressiveDownloadInfoAtom, *movieAtom, *firstMediaDataAtom, *firstMovieFragmentAtom /*, *userDataAtom*/; - Mp4Atom *level0Atom, *level1Atom, *level2Atom, *lastAtomToBeWritten; + Mp4Atom *level0Atom, *level1Atom, *level2Atom, *lastAtomToBeWritten = nullptr; try { // file type atom (mandatory) if ((fileTypeAtom = firstElement()->siblingByIdIncludingThis(Mp4AtomIds::FileType, diag))) { diff --git a/ogg/oggcontainer.cpp b/ogg/oggcontainer.cpp index 40f91be..d21e440 100644 --- a/ogg/oggcontainer.cpp +++ b/ogg/oggcontainer.cpp @@ -438,7 +438,7 @@ void OggContainer::internalMakeFile(Diagnostics &diag, AbortableProgressFeedback CopyHelper<65307> copyHelper; vector updatedPageOffsets; const OggPage *lastPage = nullptr; - std::uint64_t nextPageOffset; + auto nextPageOffset = std::uint64_t(); unordered_map pageSequenceNumberBySerialNo; // iterate through all pages of the original file