From f3ac7a035d4b5d59901142427aa111197fbc4854 Mon Sep 17 00:00:00 2001 From: cjee21 <77721854+cjee21@users.noreply.github.com> Date: Thu, 30 Jan 2025 20:15:27 +0800 Subject: [PATCH] Fix unannotated fallthroughs --- Source/MediaInfo/Audio/File_Aac.cpp | 1 + Source/MediaInfo/Audio/File_Aac_Main.cpp | 1 + Source/MediaInfo/Audio/File_Adm.cpp | 4 ++-- Source/MediaInfo/Audio/File_Flac.cpp | 2 +- Source/MediaInfo/Audio/File_Opus.cpp | 3 ++- Source/MediaInfo/Export/Export_Mpeg7.cpp | 7 ++++--- Source/MediaInfo/File__Analyze.cpp | 1 + Source/MediaInfo/File__Analyze_Buffer.cpp | 1 + Source/MediaInfo/File__Analyze_Streams_Finish.cpp | 2 +- Source/MediaInfo/Image/File_Jpeg.cpp | 1 + Source/MediaInfo/Image/File_Png.cpp | 2 +- Source/MediaInfo/MediaInfo_Config_MediaInfo.cpp | 10 +++++----- Source/MediaInfo/Multiple/File_Bdmv.cpp | 1 + Source/MediaInfo/Multiple/File_DvDif.cpp | 3 ++- Source/MediaInfo/Multiple/File_Gxf.cpp | 2 +- Source/MediaInfo/Multiple/File_MpegPs.cpp | 1 + Source/MediaInfo/Multiple/File_Mpeg_Descriptors.cpp | 2 ++ Source/MediaInfo/Multiple/File_Mxf.cpp | 3 ++- Source/MediaInfo/Multiple/File_Riff_Elements.cpp | 3 ++- Source/MediaInfo/Text/File_Eia608.cpp | 1 + Source/MediaInfo/TimeCode.cpp | 2 +- Source/MediaInfo/Video/File_Avc.cpp | 5 +++-- Source/ThirdParty/tinyxml2/tinyxml2.cpp | 6 +++--- 23 files changed, 40 insertions(+), 24 deletions(-) diff --git a/Source/MediaInfo/Audio/File_Aac.cpp b/Source/MediaInfo/Audio/File_Aac.cpp index 2c59c124e..dc5260764 100644 --- a/Source/MediaInfo/Audio/File_Aac.cpp +++ b/Source/MediaInfo/Audio/File_Aac.cpp @@ -126,6 +126,7 @@ void File_Aac::Streams_Accept() case Mode_ADTS : if (!IsSub) TestContinuousFileNames(); + break; default : ; } if (Frame_Count_NotParsedIncluded==(int64u)-1) diff --git a/Source/MediaInfo/Audio/File_Aac_Main.cpp b/Source/MediaInfo/Audio/File_Aac_Main.cpp index 36d06dacf..d78742580 100644 --- a/Source/MediaInfo/Audio/File_Aac_Main.cpp +++ b/Source/MediaInfo/Audio/File_Aac_Main.cpp @@ -723,6 +723,7 @@ void File_Aac::AudioSpecificConfig (size_t End) Frame_Count=(size_t)-1; //Forcing not to parse following data anymore } } + break; default : ; } diff --git a/Source/MediaInfo/Audio/File_Adm.cpp b/Source/MediaInfo/Audio/File_Adm.cpp index 84cfc3ceb..547784b57 100644 --- a/Source/MediaInfo/Audio/File_Adm.cpp +++ b/Source/MediaInfo/Audio/File_Adm.cpp @@ -2923,7 +2923,7 @@ static void CheckErrors_Attributes(file_adm_private* File_Adm_Private, item Item break; default: Item.AddError(Error, ':' + CraftName(item_Infos[Item_Type].Name) + to_string(i) + ":" + CraftName(Attribute_Infos[j].Name) + ":" + string(Attribute_Infos[j].Name) + " attribute shall be unique"); - // Fallthrough + [[fallthrough]]; case 1: { Attributes_Present[j] = true; @@ -3572,7 +3572,7 @@ void audioBlockFormat_Check(file_adm_private* File_Adm_Private) { BlockFormat.AddError(Error, ":GeneralCompliance:jumpPosition subelement count " + to_string(jumpPositions.size()) + " is not permitted, max is 1", Source_Atmos_1_0); break; } - // Fallthrough + [[fallthrough]]; case 1: switch (Type) { case Type_Objects: { diff --git a/Source/MediaInfo/Audio/File_Flac.cpp b/Source/MediaInfo/Audio/File_Flac.cpp index 790ad973e..2fec46a80 100644 --- a/Source/MediaInfo/Audio/File_Flac.cpp +++ b/Source/MediaInfo/Audio/File_Flac.cpp @@ -159,7 +159,7 @@ void File_Flac::Data_Parse() CASE_INFO(CUESHEET); CASE_INFO(PICTURE); case (int8u)-1: Element_Name("Frame"); - // Fallthrough + [[fallthrough]]; default : Skip_XX(Element_Size, "Data"); } diff --git a/Source/MediaInfo/Audio/File_Opus.cpp b/Source/MediaInfo/Audio/File_Opus.cpp index e26eae855..bbf04cc5b 100644 --- a/Source/MediaInfo/Audio/File_Opus.cpp +++ b/Source/MediaInfo/Audio/File_Opus.cpp @@ -160,7 +160,7 @@ void File_Opus::Identification() case 0 : // Mono/Stereo if (ch_count>2) break; // Not in spec - // else it is as Vorbis specs, no break + [[fallthrough]]; // else it is as Vorbis specs, no break case 1 : // Vorbis order if (ch_count && ch_count<=Opus_ChannelLayout_Max) { @@ -174,6 +174,7 @@ void File_Opus::Identification() if (ChannelLayout2!=Retrieve(Stream_Audio, 0, Audio_ChannelLayout)) Fill(Stream_Audio, 0, Audio_ChannelLayout, ChannelLayout2); } + break; default: ; //Unknown } diff --git a/Source/MediaInfo/Export/Export_Mpeg7.cpp b/Source/MediaInfo/Export/Export_Mpeg7.cpp index 479ead3a1..7bcbf5c8c 100644 --- a/Source/MediaInfo/Export/Export_Mpeg7.cpp +++ b/Source/MediaInfo/Export/Export_Mpeg7.cpp @@ -220,9 +220,10 @@ Ztring Mpeg7_ContentCS_Name(int32u termID, MediaInfo_Internal &MI, size_t) //xxy case 2 : return __T("Video"); case 3 : return __T("Graphics"); } - case 50: return __T("Text"); - default : return MI.Get(Stream_General, 0, General_FileExtension); + break; + case 50 : return __T("Text"); } + return MI.Get(Stream_General, 0, General_FileExtension); } //--------------------------------------------------------------------------- @@ -2668,7 +2669,7 @@ Ztring Export_Mpeg7::Transform(MediaInfo_Internal &MI, size_t Version) || !MI.Get(Stream_Video, 0, Video_Language).empty() || (!Mpeg7_AudioPresentationCS_termID(MI, 0) && !MI.Get(Stream_Audio, 0, Audio_ChannelLayout).empty())) Extended=1; - //fall through + [[fallthrough]]; case Export_Mpeg7::Version_BestEffort_Strict: if (Video_Count>1 || Audio_Count>1 diff --git a/Source/MediaInfo/File__Analyze.cpp b/Source/MediaInfo/File__Analyze.cpp index e5367350b..6121bfdf1 100644 --- a/Source/MediaInfo/File__Analyze.cpp +++ b/Source/MediaInfo/File__Analyze.cpp @@ -1829,6 +1829,7 @@ size_t File__Analyze::Read_Buffer_Seek_OneFramePerFile (size_t Method, int64u Va if (Config->Demux_Rate_Get()==0) return (size_t)-1; //Not supported Value=float64_int64s(((float64)Value)/1000000000*Config->Demux_Rate_Get()); + return 1; #else //MEDIAINFO_DEMUX return (size_t)-1; //Not supported #endif //MEDIAINFO_DEMUX diff --git a/Source/MediaInfo/File__Analyze_Buffer.cpp b/Source/MediaInfo/File__Analyze_Buffer.cpp index 016262bcf..2ae4b9774 100644 --- a/Source/MediaInfo/File__Analyze_Buffer.cpp +++ b/Source/MediaInfo/File__Analyze_Buffer.cpp @@ -1440,6 +1440,7 @@ void File__Analyze::Get_VL(const vlc Vlc[], size_t &Info, const char* Name) if (BS->GetB()) Value++; CountOfBits++; + break; case 0 : ; } diff --git a/Source/MediaInfo/File__Analyze_Streams_Finish.cpp b/Source/MediaInfo/File__Analyze_Streams_Finish.cpp index 3d70aaa93..d99c73253 100644 --- a/Source/MediaInfo/File__Analyze_Streams_Finish.cpp +++ b/Source/MediaInfo/File__Analyze_Streams_Finish.cpp @@ -1153,7 +1153,7 @@ void File__Analyze::Streams_Finish_StreamOnly_Video(size_t Pos) { case Video_HDR_Format_Version: Summary[j]+=__T(", Version "); break; case Video_HDR_Format_Level: Summary[j]+=__T('.'); break; - case Video_HDR_Format_Compression: ToAdd[j][0]+=0x20; if (ToAdd[j].size()==4) ToAdd[j].resize(2); ToAdd[j]+=__T(" metadata compression"); // Fallthrough + case Video_HDR_Format_Compression: ToAdd[j][0]+=0x20; if (ToAdd[j].size()==4) ToAdd[j].resize(2); ToAdd[j]+=__T(" metadata compression"); [[fallthrough]]; default: Summary[j] += __T(", "); } Summary[j]+=ToAdd[j]; diff --git a/Source/MediaInfo/Image/File_Jpeg.cpp b/Source/MediaInfo/Image/File_Jpeg.cpp index aa8a1e32f..62a289c78 100644 --- a/Source/MediaInfo/Image/File_Jpeg.cpp +++ b/Source/MediaInfo/Image/File_Jpeg.cpp @@ -396,6 +396,7 @@ bool File_Jpeg::Demux_UnpacketizeContainer_Test() { case Elements::SOD : //JPEG-2000 start StartIsFound=true; + break; case Elements::TEM : case Elements::RST0 : case Elements::RST1 : diff --git a/Source/MediaInfo/Image/File_Png.cpp b/Source/MediaInfo/Image/File_Png.cpp index 01f0914f3..6bc349c68 100644 --- a/Source/MediaInfo/Image/File_Png.cpp +++ b/Source/MediaInfo/Image/File_Png.cpp @@ -316,7 +316,7 @@ void File_Png::IHDR() { case 3: Bit_depth=8; // From spec: "indexed-colour PNG images (colour type 3), in which the sample depth is always 8 bits" (sample depth is our bit depth - // Fallthrough + [[fallthrough]]; case 0 : case 2: case 4: diff --git a/Source/MediaInfo/MediaInfo_Config_MediaInfo.cpp b/Source/MediaInfo/MediaInfo_Config_MediaInfo.cpp index c0a61af70..56f662892 100644 --- a/Source/MediaInfo/MediaInfo_Config_MediaInfo.cpp +++ b/Source/MediaInfo/MediaInfo_Config_MediaInfo.cpp @@ -3689,19 +3689,19 @@ Ztring MediaInfo_Config_MediaInfo::File_ProbeCaption_Set (const Ztring& NewValue { case 'E': Value_Int <<= 10; - // Fall through + [[fallthrough]]; case 'P': Value_Int <<= 10; - // Fall through + [[fallthrough]]; case 'T': Value_Int <<= 10; - // Fall through + [[fallthrough]]; case 'G': Value_Int <<= 10; - // Fall through + [[fallthrough]]; case 'M': Value_Int <<= 10; - // Fall through + [[fallthrough]]; default: Value_Int <<= 10; } diff --git a/Source/MediaInfo/Multiple/File_Bdmv.cpp b/Source/MediaInfo/Multiple/File_Bdmv.cpp index 6a548ad78..8374936c0 100644 --- a/Source/MediaInfo/Multiple/File_Bdmv.cpp +++ b/Source/MediaInfo/Multiple/File_Bdmv.cpp @@ -1542,6 +1542,7 @@ void File_Bdmv::Mpls_ExtensionData_SubPath_entries() for (int8u Pos=0; PosStreams[elementary_PID]->descriptor_tag=0x7B; } + break; default : ; } FILLING_END(); @@ -3304,6 +3305,7 @@ void File_Mpeg_Descriptors::Descriptor_7C() Complete_Stream->Streams[elementary_PID]->descriptor_tag=0x7C; Complete_Stream->Streams[elementary_PID]->Infos["Format_Profile"]=Mpeg_Descriptors_MPEG_4_audio_profile_and_level(Profile_and_level); } + break; default : ; } FILLING_END(); diff --git a/Source/MediaInfo/Multiple/File_Mxf.cpp b/Source/MediaInfo/Multiple/File_Mxf.cpp index ef0901d90..17bd5e96d 100644 --- a/Source/MediaInfo/Multiple/File_Mxf.cpp +++ b/Source/MediaInfo/Multiple/File_Mxf.cpp @@ -5132,7 +5132,7 @@ size_t File_Mxf::Read_Buffer_Seek (size_t Method, int64u Value, int64u ID) } Value=float64_int64s(((float64)Value)/1000000000*Descriptor->second.SampleRate); } - //No break; + [[fallthrough]]; case 3 : //FrameNumber Value+=Config->File_IgnoreEditsBefore; @@ -14321,6 +14321,7 @@ void File_Mxf::ChooseParser__FromCodingScheme(const essences::iterator &Essence, ChooseParser_SmpteSt0337(Essence, Descriptor); if (Descriptor->second.ChannelCount>=2 && Descriptor->second.ChannelCount!=(int32u)-1) //PCM, but one file is found with Dolby E in it ChooseParser_ChannelSplitting(Essence, Descriptor); + [[fallthrough]]; default : return ChooseParser_Pcm(Essence, Descriptor); } case 0x02 : //Compressed coding diff --git a/Source/MediaInfo/Multiple/File_Riff_Elements.cpp b/Source/MediaInfo/Multiple/File_Riff_Elements.cpp index 2c241b1bd..ebf0107ca 100644 --- a/Source/MediaInfo/Multiple/File_Riff_Elements.cpp +++ b/Source/MediaInfo/Multiple/File_Riff_Elements.cpp @@ -482,7 +482,7 @@ static std::string Riff_CodePage(int16u CodePage) case 28591: return "ISO-8859-1"; case 28592: return "ISO-8859-2"; case 65001: return "UTF-8"; - default: return to_string(CodePage); + default: return to_string(CodePage); } } @@ -2169,6 +2169,7 @@ void File_Riff::AVI__hdlr_strl_vprp() Fill(Stream_Video, 0, Video_ScanOrder, "TFF"); if (VideoYValidStartLines.size()==2 && VideoYValidStartLines[0]>VideoYValidStartLines[1]) Fill(Stream_Video, 0, Video_ScanOrder, "BFF"); + break; default: ; } FILLING_END(); diff --git a/Source/MediaInfo/Text/File_Eia608.cpp b/Source/MediaInfo/Text/File_Eia608.cpp index e755e55f8..637e98ee9 100644 --- a/Source/MediaInfo/Text/File_Eia608.cpp +++ b/Source/MediaInfo/Text/File_Eia608.cpp @@ -982,6 +982,7 @@ void File_Eia608::Special_14(int8u cc_data_2) case 0x2F : //EOC - end of Caption TextMode=false; StreamPos=TextMode*2+DataChannelMode; + break; default: ; } diff --git a/Source/MediaInfo/TimeCode.cpp b/Source/MediaInfo/TimeCode.cpp index 728c6d446..749e34890 100644 --- a/Source/MediaInfo/TimeCode.cpp +++ b/Source/MediaInfo/TimeCode.cpp @@ -723,7 +723,7 @@ TimeCode TimeCode::ToRescaled(uint32_t FramesMax, flags Flags, rounding Rounding { case Nearest: Result += FrameRate / 2; - //fall through + [[fallthrough]]; case Floor: Result /= FrameRate; break; diff --git a/Source/MediaInfo/Video/File_Avc.cpp b/Source/MediaInfo/Video/File_Avc.cpp index 24aaa66c6..1d09552ec 100644 --- a/Source/MediaInfo/Video/File_Avc.cpp +++ b/Source/MediaInfo/Video/File_Avc.cpp @@ -1181,7 +1181,7 @@ void File_Avc::Streams_Fill(std::vector::iterator seq case Video_MasteringDisplay_Luminance: if (Retrieve_Const(Stream_Video, 0, Item->first) == Item->second) break; - // Fallthrough + [[fallthrough]]; default: Fill(Stream_Video, 0, Item->first, Item->second); } @@ -2950,7 +2950,7 @@ void File_Avc::dec_ref_pic_marking(std::vector &memory_management_control break; case 3 : Skip_UE( "difference_of_pic_nums_minus1"); - //break; 3 --> difference_of_pic_nums_minus1 then long_term_frame_idx + [[fallthrough]]; // 3 --> difference_of_pic_nums_minus1 then long_term_frame_idx case 6 : Skip_UE( "long_term_frame_idx"); break; @@ -4796,6 +4796,7 @@ void File_Avc::SPS_PPS() Element_End0(); } } + break; default:; } } diff --git a/Source/ThirdParty/tinyxml2/tinyxml2.cpp b/Source/ThirdParty/tinyxml2/tinyxml2.cpp index 89b791336..0f955e245 100644 --- a/Source/ThirdParty/tinyxml2/tinyxml2.cpp +++ b/Source/ThirdParty/tinyxml2/tinyxml2.cpp @@ -432,17 +432,17 @@ void XMLUtil::ConvertUTF32ToUTF8( unsigned long input, char* output, int* length --output; *output = (char)((input | BYTE_MARK) & BYTE_MASK); input >>= 6; - //fall through + [[fallthrough]]; case 3: --output; *output = (char)((input | BYTE_MARK) & BYTE_MASK); input >>= 6; - //fall through + [[fallthrough]]; case 2: --output; *output = (char)((input | BYTE_MARK) & BYTE_MASK); input >>= 6; - //fall through + [[fallthrough]]; case 1: --output; *output = (char)(input | FIRST_BYTE_MARK[*length]);