]> granicus.if.org Git - libmatroska/commitdiff
clang-tidy: do the same for pointers
authorRosen Penev <rosenp@gmail.com>
Sat, 24 Sep 2022 21:34:44 +0000 (14:34 -0700)
committerRosen Penev <rosenp@gmail.com>
Mon, 26 Sep 2022 20:48:34 +0000 (13:48 -0700)
Signed-off-by: Rosen Penev <rosenp@gmail.com>
matroska/KaxBlock.h
src/KaxBlock.cpp
src/KaxCues.cpp
src/KaxCuesData.cpp

index 2c45da7a95a90d0ccfe0ca27adc3b64ba2689970..14d7a55a4ee218f1fe47738e98a0b73229821f79 100644 (file)
@@ -117,7 +117,7 @@ class MATROSKA_DLL_API SimpleDataBuffer : public DataBuffer {
 
     static bool myFreeBuffer(const DataBuffer & aBuffer)
     {
-      binary *_Buffer = static_cast<const SimpleDataBuffer*>(&aBuffer)->BaseBuffer;
+      auto _Buffer = static_cast<const SimpleDataBuffer*>(&aBuffer)->BaseBuffer;
       if (_Buffer != nullptr)
         free(_Buffer);
       return true;
index 4d069ded4af1ae648905b20568f24bd5b703a118..6d6b1b32fdfe2c6f3dc51eac8d39cfb7cfef6ea4 100644 (file)
@@ -455,7 +455,7 @@ filepos_t KaxInternalBlock::ReadData(IOCallback & input, ScopeMode ReadFully)
       if (Result != GetSize())
         throw SafeReadIOCallback::EndOfStreamX(GetSize() - Result);
 
-      binary *BufferStart = EbmlBinary::GetBuffer();
+      binary *const BufferStart = EbmlBinary::GetBuffer();
 
       SafeReadIOCallback Mem(*this);
       uint8 BlockHeadSize = 4;
@@ -562,14 +562,14 @@ filepos_t KaxInternalBlock::ReadData(IOCallback & input, ScopeMode ReadFully)
         }
       }
 
-      binary *BufferEnd = BufferStart + GetSize();
+      binary *const BufferEnd = BufferStart + GetSize();
       const size_t NumFrames  = myBuffers.size();
 
       // Sanity checks for frame pointers and boundaries.
       for (size_t Index = 0; Index < NumFrames; ++Index) {
-        binary *FrameStart  = myBuffers[Index]->Buffer();
-        binary *FrameEnd    = FrameStart + myBuffers[Index]->Size();
-        binary *ExpectedEnd = (Index + 1) < NumFrames ? myBuffers[Index + 1]->Buffer() : BufferEnd;
+        binary *const FrameStart  = myBuffers[Index]->Buffer();
+        binary *const FrameEnd    = FrameStart + myBuffers[Index]->Size();
+        binary *const ExpectedEnd = (Index + 1) < NumFrames ? myBuffers[Index + 1]->Buffer() : BufferEnd;
 
         if ((FrameStart < BufferStart) || (FrameEnd > BufferEnd) || (FrameEnd != ExpectedEnd))
           throw SafeReadIOCallback::EndOfStreamX(0);
@@ -1027,7 +1027,7 @@ bool KaxBlockBlob::ReplaceSimpleByGroup()
   else {
 
     if (Block.simpleblock != nullptr) {
-      KaxSimpleBlock *old_simpleblock = Block.simpleblock;
+      KaxSimpleBlock *const old_simpleblock = Block.simpleblock;
       Block.group = new KaxBlockGroup();
       // _TODO_ : move all the data to the blockgroup
       assert(false);
index 9309d04e378252f723c68da4b4cb2a3fcf1f2f2b..bdaf35956af30869548cf68c35c17e3e45dd0336 100644 (file)
@@ -142,11 +142,11 @@ const KaxCuePoint * KaxCues::GetTimecodePoint(uint64 aTimecode) const
 
 uint64 KaxCues::GetTimecodePosition(uint64 aTimecode) const
 {
-  const KaxCuePoint * aPoint = GetTimecodePoint(aTimecode);
+  const KaxCuePoint * const aPoint = GetTimecodePoint(aTimecode);
   if (aPoint == nullptr)
     return 0;
 
-  const KaxCueTrackPositions * aTrack = aPoint->GetSeekPosition();
+  const KaxCueTrackPositions * const aTrack = aPoint->GetSeekPosition();
   if (aTrack == nullptr)
     return 0;
 
index 9c50f3ee7564f1702dab5a81b32ce4a644c84781..f5287141707d50e561bc807b9b95331e4590c2bc 100644 (file)
@@ -120,7 +120,7 @@ void KaxCuePoint::PositionSet(const KaxInternalBlock & BlockReference, const Kax
 #endif // MATROSKA_VERSION
 
   if (BlockGroup != nullptr) {
-    const KaxCodecState *CodecState = static_cast<KaxCodecState *>(BlockGroup->FindFirstElt(EBML_INFO(KaxCodecState)));
+    const auto CodecState = static_cast<const KaxCodecState *>(BlockGroup->FindFirstElt(EBML_INFO(KaxCodecState)));
     if (CodecState != nullptr) {
       auto &CueCodecState = AddNewChild<KaxCueCodecState>(NewPositions);
       *static_cast<EbmlUInteger*>(&CueCodecState) = BlockGroup->GetParentCluster()->GetParentSegment()->GetRelativePosition(CodecState->GetElementPosition());