Skip to content

Commit 3824226

Browse files
authored
Fix CI - unused vars (#2017)
* Fix CI - unused vars * sctp unused * lws unused * install
1 parent 98188ff commit 3824226

File tree

8 files changed

+30
-6
lines changed

8 files changed

+30
-6
lines changed

Diff for: .github/workflows/ci.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
run: |
2424
bash scripts/check-clang.sh
2525
mac-os-build-clang:
26-
runs-on: macos-11
26+
runs-on: macos-12
2727
env:
2828
CC: /usr/bin/clang
2929
CXX: /usr/bin/clang++
@@ -49,7 +49,7 @@ jobs:
4949
cd build
5050
./tst/webrtc_client_test
5151
mac-os-build-gcc:
52-
runs-on: macos-11
52+
runs-on: macos-12
5353
env:
5454
CC: gcc
5555
CXX: g++
@@ -104,7 +104,7 @@ jobs:
104104
cd build
105105
./tst/webrtc_client_test
106106
static-build-mac:
107-
runs-on: macos-11
107+
runs-on: macos-12
108108
env:
109109
AWS_KVS_LOG_LEVEL: 2
110110
permissions:

Diff for: CMakeLists.txt

+8-1
Original file line numberDiff line numberDiff line change
@@ -455,7 +455,14 @@ if(COMPILER_WARNINGS)
455455
target_compile_options(kvsWebrtcSignalingClient PUBLIC -Wall -Werror -pedantic -Wextra -Wno-unknown-warning-option)
456456
endif()
457457

458-
install(TARGETS kvsWebrtcClient kvsWebrtcSignalingClient kvsWebRtcThreadpool
458+
if(ENABLE_KVS_THREADPOOL)
459+
install(TARGETS kvsWebRtcThreadpool
460+
LIBRARY DESTINATION lib
461+
ARCHIVE DESTINATION lib
462+
)
463+
endif()
464+
465+
install(TARGETS kvsWebrtcClient kvsWebrtcSignalingClient
459466
LIBRARY DESTINATION lib
460467
ARCHIVE DESTINATION lib
461468
)

Diff for: src/source/Ice/TurnConnection.c

+1
Original file line numberDiff line numberDiff line change
@@ -1033,6 +1033,7 @@ STATUS checkTurnPeerConnections(PTurnConnection pTurnConnection)
10331033
PStunAttributeChannelNumber pStunAttributeChannelNumber = NULL;
10341034
UINT32 i = 0;
10351035

1036+
UNUSED_PARAM(sendStatus);
10361037
// turn mutex is assumed to be locked.
10371038
CHK(pTurnConnection != NULL, STATUS_NULL_ARG);
10381039
for (i = 0; i < pTurnConnection->turnPeerCount; ++i) {

Diff for: src/source/PeerConnection/Rtcp.c

+9
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,15 @@ static STATUS onRtcpReceiverReport(PRtcpPacket pRtcpPacket, PKvsPeerConnection p
8787
UINT32 rttPropDelayMsec = 0, rttPropDelay, delaySinceLastSR, lastSR, interarrivalJitter, extHiSeqNumReceived, cumulativeLost, senderSSRC, ssrc1;
8888
UINT64 currentTimeNTP = convertTimestampToNTP(GETTIME());
8989

90+
UNUSED_PARAM(rttPropDelayMsec);
91+
UNUSED_PARAM(rttPropDelay);
92+
UNUSED_PARAM(delaySinceLastSR);
93+
UNUSED_PARAM(lastSR);
94+
UNUSED_PARAM(interarrivalJitter);
95+
UNUSED_PARAM(extHiSeqNumReceived);
96+
UNUSED_PARAM(cumulativeLost);
97+
UNUSED_PARAM(senderSSRC);
98+
9099
CHK(pKvsPeerConnection != NULL && pRtcpPacket != NULL, STATUS_NULL_ARG);
91100
// https://tools.ietf.org/html/rfc3550#section-6.4.2
92101
if (pRtcpPacket->payloadLength != RTCP_PACKET_RECEIVER_REPORT_MINLEN) {

Diff for: src/source/Sctp/Sctp.c

+4
Original file line numberDiff line numberDiff line change
@@ -366,5 +366,9 @@ INT32 onSctpInboundPacket(struct socket* sock, union sctp_sockstore addr, PVOID
366366
free(data);
367367
}
368368

369+
if (STATUS_FAILED(retStatus)) {
370+
return -1;
371+
}
372+
369373
return 1;
370374
}

Diff for: src/source/Signaling/LwsApiCalls.c

+4
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ INT32 lwsHttpCallbackRoutine(struct lws* wsi, enum lws_callback_reasons reason,
3737
PStateMachineState pStateMachineState;
3838
BOOL skewMapContains = FALSE;
3939

40+
UNUSED_PARAM(logLevel);
4041
DLOGV("HTTPS callback with reason %d", reason);
4142

4243
// Early check before accessing the custom data field to see if we are interested in processing the message
@@ -1493,6 +1494,9 @@ STATUS joinStorageSessionLws(PSignalingClient pSignalingClient, UINT64 time)
14931494
PCHAR pResponseStr;
14941495
UINT32 resultLen;
14951496

1497+
UNUSED_PARAM(pResponseStr);
1498+
UNUSED_PARAM(resultLen);
1499+
14961500
CHK(pSignalingClient != NULL, STATUS_NULL_ARG);
14971501
CHK(pSignalingClient->channelEndpointWebrtc[0] != '\0', STATUS_INTERNAL_ERROR);
14981502

Diff for: src/source/Stun/Stun.c

+1
Original file line numberDiff line numberDiff line change
@@ -379,6 +379,7 @@ STATUS deserializeStunPacket(PBYTE pStunBuffer, UINT32 bufferSize, PBYTE passwor
379379
UINT8 *pErrorPhrase, *pBuffer = NULL;
380380
UINT16 errorPhraseLength, channelNumber, buffereLength, errorCode;
381381

382+
UNUSED_PARAM(pStunAttributeFingerprint);
382383
CHK(pStunBuffer != NULL && ppStunPacket != NULL, STATUS_NULL_ARG);
383384
CHK(bufferSize >= STUN_HEADER_LEN, STATUS_INVALID_ARG);
384385

Diff for: tst/JitterBufferFunctionalityTest.cpp

-2
Original file line numberDiff line numberDiff line change
@@ -1146,11 +1146,9 @@ TEST_F(JitterBufferFunctionalityTest, timestampOverflowTest)
11461146
UINT32 pktCount = 7;
11471147
UINT32 startingSequenceNumber = 0;
11481148
UINT32 missingSequenceNumber = 0;
1149-
UINT32 firstSequenceNumber = 0;
11501149
initializeJitterBuffer(4, 0, pktCount);
11511150
srand(time(0));
11521151
startingSequenceNumber = rand()%UINT16_MAX;
1153-
firstSequenceNumber = startingSequenceNumber - 1;
11541152

11551153
// First frame "1"
11561154
mPRtpPackets[0]->payloadLength = 1;

0 commit comments

Comments
 (0)