unused var fix

awslabs · Feb 23, 2024 · 3bc1961 · 3bc1961
1 parent 233a831
commit 3bc1961
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 13 deletions.
diff --git a/src/source/PeerConnection/PeerConnection.c b/src/source/PeerConnection/PeerConnection.c
@@ -1832,8 +1832,8 @@ STATUS twccManagerOnPacketSent(PKvsPeerConnection pKvsPeerConnection, PRtpPacket
     ENTERS();
     STATUS retStatus = STATUS_SUCCESS;
     BOOL locked = FALSE;
-    UINT16 seqNum, updatedSeqNum;
-    PTwccRtpPacketInfo pTwccRtpPktInfo, tempTwccRtpPktInfo;
+    UINT16 seqNum;
+    PTwccRtpPacketInfo pTwccRtpPktInfo;
 
     CHK(pKvsPeerConnection != NULL && pRtpPacket != NULL, STATUS_NULL_ARG);
     CHK(pKvsPeerConnection->onSenderBandwidthEstimation != NULL && pKvsPeerConnection->pTwccManager != NULL, STATUS_SUCCESS);

diff --git a/src/source/PeerConnection/Rtcp.c b/src/source/PeerConnection/Rtcp.c
@@ -299,11 +299,9 @@ STATUS parseRtcpTwccPacket(PRtcpPacket pRtcpPacket, PTwccManager pTwccManager)
 STATUS onRtcpTwccPacket(PRtcpPacket pRtcpPacket, PKvsPeerConnection pKvsPeerConnection)
 {
     STATUS retStatus = STATUS_SUCCESS;
-    PTwccManager twcc;
+    PTwccManager pTwccManager;
     BOOL locked = FALSE;
-    BOOL empty = TRUE;
     UINT64 sn = 0;
-    INT64 ageOfOldestPacket;
     UINT64 localStartTimeKvs, localEndTimeKvs;
     UINT64 sentBytes = 0, receivedBytes = 0;
     UINT64 sentPackets = 0, receivedPackets = 0;
@@ -318,21 +316,21 @@ STATUS onRtcpTwccPacket(PRtcpPacket pRtcpPacket, PKvsPeerConnection pKvsPeerConn
 
     MUTEX_LOCK(pKvsPeerConnection->twccLock);
     locked = TRUE;
-    twcc = pKvsPeerConnection->pTwccManager;
-    CHK_STATUS(parseRtcpTwccPacket(pRtcpPacket, twcc));
-    sn = twcc->prevReportedBaseSeqNum;
+    pTwccManager = pKvsPeerConnection->pTwccManager;
+    CHK_STATUS(parseRtcpTwccPacket(pRtcpPacket, pTwccManager));
+    sn = pTwccManager->prevReportedBaseSeqNum;
 
     // Use != instead to cover the case where the group of sequence numbers being checked
     // are trending towards MAX_UINT16 and rolling over to 0+, example range [65534, 10]
     // We also check for twcc->lastReportedSeqNum + 1 to include the last seq number in the
     // report. Without this, we do not check for the seqNum that could cause it to not be cleared
     // from memory
-    for (seqNum = sn; seqNum != (twcc->lastReportedSeqNum + 1); seqNum++) {
+    for (seqNum = sn; seqNum != (pTwccManager->lastReportedSeqNum + 1); seqNum++) {
         if (!localStartTimeRecorded) {
             // This could happen if the prev packet was deleted as part of rolling window or if there
             // is an overlap of RTP packet statuses between TWCC packets. This could also fail if it is
             // the first ever packet (seqNum 0)
-            if (hashTableGet(twcc->pTwccRtpPktInfosHashTable, seqNum - 1, &value) == STATUS_HASH_KEY_NOT_PRESENT) {
+            if (hashTableGet(pTwccManager->pTwccRtpPktInfosHashTable, seqNum - 1, &value) == STATUS_HASH_KEY_NOT_PRESENT) {
                 localStartTimeKvs = TWCC_PACKET_UNITIALIZED_TIME;
             } else {
                 pTwccPacket = (PTwccRtpPacketInfo) value;
@@ -341,7 +339,7 @@ STATUS onRtcpTwccPacket(PRtcpPacket pRtcpPacket, PKvsPeerConnection pKvsPeerConn
             }
             if (localStartTimeKvs == TWCC_PACKET_UNITIALIZED_TIME) {
                 // time not yet set. If prev seqNum was deleted
-                if (STATUS_SUCCEEDED(hashTableGet(twcc->pTwccRtpPktInfosHashTable, seqNum, &value))) {
+                if (STATUS_SUCCEEDED(hashTableGet(pTwccManager->pTwccRtpPktInfosHashTable, seqNum, &value))) {
                     pTwccPacket = (PTwccRtpPacketInfo) value;
                     localStartTimeKvs = pTwccPacket->localTimeKvs;
                     localStartTimeRecorded = TRUE;
@@ -351,7 +349,7 @@ STATUS onRtcpTwccPacket(PRtcpPacket pRtcpPacket, PKvsPeerConnection pKvsPeerConn
 
         // The time it would not succeed is if there is an overlap in the RTP packet status between the TWCC
         // packets
-        if (STATUS_SUCCEEDED(hashTableGet(twcc->pTwccRtpPktInfosHashTable, seqNum, &value))) {
+        if (STATUS_SUCCEEDED(hashTableGet(pTwccManager->pTwccRtpPktInfosHashTable, seqNum, &value))) {
             pTwccPacket = (PTwccRtpPacketInfo) value;
             localEndTimeKvs = pTwccPacket->localTimeKvs;
             duration = localEndTimeKvs - localStartTimeKvs;
@@ -360,7 +358,7 @@ STATUS onRtcpTwccPacket(PRtcpPacket pRtcpPacket, PKvsPeerConnection pKvsPeerConn
             if (pTwccPacket->remoteTimeKvs != TWCC_PACKET_LOST_TIME) {
                 receivedBytes += pTwccPacket->packetSize;
                 receivedPackets++;
-                if (STATUS_SUCCEEDED(hashTableRemove(pKvsPeerConnection->pTwccManager->pTwccRtpPktInfosHashTable, seqNum))) {
+                if (STATUS_SUCCEEDED(hashTableRemove(pTwccManager->pTwccRtpPktInfosHashTable, seqNum))) {
                     SAFE_MEMFREE(pTwccPacket);
                 }
             }

diff --git a/tst/RtcpFunctionalityTest.cpp b/tst/RtcpFunctionalityTest.cpp
@@ -297,6 +297,12 @@ TEST_F(RtcpFunctionalityTest, onpli)
 
 static void testBwHandler(UINT64 customData, UINT32 txBytes, UINT32 rxBytes, UINT32 txPacketsCnt, UINT32 rxPacketsCnt,
                                                    UINT64 duration) {
+    UNUSED_PARAM(customData);
+    UNUSED_PARAM(txBytes);
+    UNUSED_PARAM(rxBytes);
+    UNUSED_PARAM(txPacketsCnt);
+    UNUSED_PARAM(rxPacketsCnt);
+    UNUSED_PARAM(duration);
     return;
 }