Fixed some build breaks reported by CI

Haivision · Feb 26, 2024 · 5b99754 · 5b99754
1 parent f416392
commit 5b99754
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/srtcore/core.cpp b/srtcore/core.cpp
@@ -9762,7 +9762,7 @@ void srt::CUDT::updateAfterSrtHandshake(int hsv)
     }
 }
 
-int srt::CUDT::packLostData(CPacket& w_packet, int32_t exp_seq)
+int srt::CUDT::packLostData(CPacket& w_packet, int32_t exp_seq SRT_ATR_UNUSED)
 {
     // protect m_iSndLastDataAck from updating by ACK processing
     UniqueLock ackguard(m_RecvAckLock);

diff --git a/srtcore/group.cpp b/srtcore/group.cpp
@@ -991,7 +991,7 @@ CRcvBuffer::InsertInfo CUDTGroup::addDataUnit(groups::SocketData* member, CUnit*
 
         if (info.result == CRcvBuffer::InsertInfo::INSERTED)
         {
-            w_have_loss = checkPacketArrivalLoss(member, u->m_Packet, (w_losses));
+            w_have_loss = checkPacketArrivalLoss(member, rpkt, (w_losses));
         }
     }
 
@@ -5726,15 +5726,15 @@ int CUDTGroup::packLostData(CUDT* core, CPacket& w_packet, int32_t exp_seq)
 
     // XXX This is temporarily used for broadcast with common loss list.
     bool have_extracted = false;
-    const char* as = "FIRST FOUND";
+    IF_HEAVY_LOGGING(const char* as = "FIRST FOUND");
     if (exp_seq == SRT_SEQNO_NONE)
     {
         exp_seq = m_pSndLossList->popLostSeq();
         have_extracted = (exp_seq != SRT_SEQNO_NONE);
     }
     else
     {
-        as = "EXPECTED";
+        IF_HEAVY_LOGGING(as = "EXPECTED");
         have_extracted = m_pSndLossList->popLostSeq(exp_seq);
     }
 
@@ -5966,8 +5966,9 @@ void* CUDTGroup::tsbpd(void* param)
                 // follow the drop, but this must be done outside the lock on the buffer.
                 synch_loss_after_drop = iDropCnt;
 
+#if ENABLE_LOGGING
                 const int64_t timediff_us = count_microseconds(tnow - info.tsbpd_time);
-
+#endif
 #if ENABLE_HEAVY_LOGGING
                 HLOGC(tslog.Debug,
                       log << self->CONID() << "grp/tsbpd: DROPSEQ: up to seqno %" << CSeqNo::decseq(info.seqno) << " ("

diff --git a/srtcore/queue.cpp b/srtcore/queue.cpp
@@ -65,7 +65,7 @@ using namespace std;
 using namespace srt::sync;
 using namespace srt_logging;
 
-srt::CUnitQueue::CUnitQueue(int initNumUnits, int mss, UDPSOCKET owner)
+srt::CUnitQueue::CUnitQueue(int initNumUnits, int mss, SRTSOCKET owner)
     : m_iNumTaken(0)
     , m_iMSS(mss)
     , m_iBlockSize(initNumUnits)