Skip to content

Commit 593f6ff

Browse files
disa6302disa6302
committed
Clang format
1 parent b68b162 commit 593f6ff

File tree

49 files changed

+502
-624
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+502
-624
lines changed

‎.github/workflows/ci.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,14 @@ on:
1111
- master
1212
jobs:
1313
clang-format-check:
14-
runs-on: macos-latest
14+
runs-on: macos-11
1515
steps:
1616
- name: Clone repository
17-
uses: actions/checkout@v2
17+
uses: actions/checkout@v3
1818
- name: Install clang-format
1919
run: |
20-
brew install clang-format@8
20+
brew install clang-format
21+
clang-format --version
2122
- name: Run clang format check
2223
run: |
2324
bash scripts/check-clang.sh

‎src/client/include/com/amazonaws/kinesis/video/client/Include.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -331,7 +331,6 @@ extern "C" {
331331
*/
332332
#define SERVICE_CALL_DEFAULT_TIMEOUT (10 * HUNDREDS_OF_NANOS_IN_A_SECOND)
333333

334-
335334
/**
336335
* Service call infinite timeout for streaming
337336
*/
@@ -581,8 +580,9 @@ typedef enum {
581580
*PVIDEO_CODEC_ID;
582581

583582
#define GET_STREAMING_TYPE_STR(st) \
584-
((st) == STREAMING_TYPE_REALTIME ? (PCHAR) "STREAMING_TYPE_REALTIME" \
585-
: (st) == STREAMING_TYPE_NEAR_REALTIME ? (PCHAR) "STREAMING_TYPE_NEAR_REALTIME" : "STREAMING_TYPE_OFFLINE")
583+
((st) == STREAMING_TYPE_REALTIME ? (PCHAR) "STREAMING_TYPE_REALTIME" \
584+
: (st) == STREAMING_TYPE_NEAR_REALTIME ? (PCHAR) "STREAMING_TYPE_NEAR_REALTIME" \
585+
: "STREAMING_TYPE_OFFLINE")
586586

587587
/**
588588
* Whether the streaming mode is offline
@@ -664,7 +664,7 @@ typedef enum {
664664

665665
// Forbidden
666666
SERVICE_CALL_FORBIDDEN = 403,
667-
667+
668668
// Security Credentials Expired
669669
SERVICE_CALL_SIGNATURE_EXPIRED = 10008,
670670

‎src/client/src/AuthIntegration.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ UINT64 getCurrentAuthExpiration(PKinesisVideoClient pKinesisVideoClient)
115115
*/
116116
UINT64 randomizeAuthInfoExpiration(PKinesisVideoClient pKinesisVideoClient, UINT64 expiration, UINT64 currentTime)
117117
{
118-
UINT64 jitterInSec = (UINT64)((expiration - currentTime) * AUTH_INFO_EXPIRATION_JITTER_RATIO / HUNDREDS_OF_NANOS_IN_A_SECOND);
118+
UINT64 jitterInSec = (UINT64) ((expiration - currentTime) * AUTH_INFO_EXPIRATION_JITTER_RATIO / HUNDREDS_OF_NANOS_IN_A_SECOND);
119119

120120
// Quick check whether we need to do anything
121121
if (!ENABLE_AUTH_INFO_EXPIRATION_RANDOMIZATION || jitterInSec == 0 ||

‎src/client/src/Client.c

Lines changed: 17 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,8 @@ STATUS checkIntermittentProducerCallback(UINT32 timerId, UINT64 currentTime, UIN
9595
return retStatus;
9696
}
9797

98-
STATUS setupDefaultKvsRetryStrategyParameters(PKinesisVideoClient pKinesisVideoClient) {
98+
STATUS setupDefaultKvsRetryStrategyParameters(PKinesisVideoClient pKinesisVideoClient)
99+
{
99100
ENTERS();
100101
STATUS retStatus = STATUS_SUCCESS;
101102
PKvsRetryStrategyCallbacks pKvsRetryStrategyCallbacks = &(pKinesisVideoClient->deviceInfo.clientInfo.kvsRetryStrategyCallbacks);
@@ -107,14 +108,16 @@ STATUS setupDefaultKvsRetryStrategyParameters(PKinesisVideoClient pKinesisVideoC
107108
pKvsRetryStrategyCallbacks->getCurrentRetryAttemptNumberFn = getExponentialBackoffRetryCount;
108109

109110
// Use exponential backoff config for state machine
110-
pKinesisVideoClient->deviceInfo.clientInfo.kvsRetryStrategy.pRetryStrategyConfig = (PRetryStrategyConfig)&DEFAULT_STATE_MACHINE_EXPONENTIAL_BACKOFF_RETRY_CONFIGURATION;
111+
pKinesisVideoClient->deviceInfo.clientInfo.kvsRetryStrategy.pRetryStrategyConfig =
112+
(PRetryStrategyConfig) &DEFAULT_STATE_MACHINE_EXPONENTIAL_BACKOFF_RETRY_CONFIGURATION;
111113

112114
CleanUp:
113115
LEAVES();
114116
return retStatus;
115117
}
116118

117-
STATUS configureClientWithRetryStrategy(PKinesisVideoClient pKinesisVideoClient) {
119+
STATUS configureClientWithRetryStrategy(PKinesisVideoClient pKinesisVideoClient)
120+
{
118121
ENTERS();
119122
PRetryStrategy pRetryStrategy = NULL;
120123
STATUS retStatus = STATUS_SUCCESS;
@@ -126,11 +129,8 @@ STATUS configureClientWithRetryStrategy(PKinesisVideoClient pKinesisVideoClient)
126129

127130
// If the callbacks for retry strategy are already set, then use that otherwise
128131
// build the client with a default retry strategy.
129-
if (pKvsRetryStrategyCallbacks->createRetryStrategyFn == NULL ||
130-
pKvsRetryStrategyCallbacks->freeRetryStrategyFn == NULL ||
131-
pKvsRetryStrategyCallbacks->executeRetryStrategyFn == NULL ||
132-
pKvsRetryStrategyCallbacks->getCurrentRetryAttemptNumberFn == NULL) {
133-
132+
if (pKvsRetryStrategyCallbacks->createRetryStrategyFn == NULL || pKvsRetryStrategyCallbacks->freeRetryStrategyFn == NULL ||
133+
pKvsRetryStrategyCallbacks->executeRetryStrategyFn == NULL || pKvsRetryStrategyCallbacks->getCurrentRetryAttemptNumberFn == NULL) {
134134
CHK_STATUS(setupDefaultKvsRetryStrategyParameters(pKinesisVideoClient));
135135
}
136136

@@ -142,15 +142,16 @@ STATUS configureClientWithRetryStrategy(PKinesisVideoClient pKinesisVideoClient)
142142
return retStatus;
143143
}
144144

145-
STATUS freeClientRetryStrategy(PKinesisVideoClient pKinesisVideoClient) {
145+
STATUS freeClientRetryStrategy(PKinesisVideoClient pKinesisVideoClient)
146+
{
146147
ENTERS();
147148
STATUS retStatus = STATUS_SUCCESS;
148149

149-
CHK(pKinesisVideoClient != NULL &&
150-
pKinesisVideoClient->deviceInfo.clientInfo.kvsRetryStrategyCallbacks.freeRetryStrategyFn != NULL, STATUS_SUCCESS);
150+
CHK(pKinesisVideoClient != NULL && pKinesisVideoClient->deviceInfo.clientInfo.kvsRetryStrategyCallbacks.freeRetryStrategyFn != NULL,
151+
STATUS_SUCCESS);
151152

152153
CHK_STATUS(pKinesisVideoClient->deviceInfo.clientInfo.kvsRetryStrategyCallbacks.freeRetryStrategyFn(
153-
&(pKinesisVideoClient->deviceInfo.clientInfo.kvsRetryStrategy)));
154+
&(pKinesisVideoClient->deviceInfo.clientInfo.kvsRetryStrategy)));
154155
pKinesisVideoClient->deviceInfo.clientInfo.kvsRetryStrategy.pRetryStrategy = NULL;
155156

156157
CleanUp:
@@ -266,7 +267,7 @@ STATUS createKinesisVideoClient(PDeviceInfo pDeviceInfo, PClientCallbacks pClien
266267
CHK(IS_VALID_CVAR_VALUE(pKinesisVideoClient->base.ready), STATUS_NOT_ENOUGH_MEMORY);
267268

268269
// Set the tags pointer to point after the array of streams
269-
pKinesisVideoClient->deviceInfo.tags = (PTag)((PKinesisVideoStream*) (pKinesisVideoClient + 1) + pDeviceInfo->streamCount);
270+
pKinesisVideoClient->deviceInfo.tags = (PTag) ((PKinesisVideoStream*) (pKinesisVideoClient + 1) + pDeviceInfo->streamCount);
270271

271272
// Package the tags after the structure
272273
CHK_STATUS(packageTags(pDeviceInfo->tagCount, pDeviceInfo->tags, tagsSize, pKinesisVideoClient->deviceInfo.tags, NULL));
@@ -280,7 +281,8 @@ STATUS createKinesisVideoClient(PDeviceInfo pDeviceInfo, PClientCallbacks pClien
280281
pKinesisVideoClient->clientCallbacks.createMutexFn(pKinesisVideoClient->clientCallbacks.customData, TRUE);
281282

282283
// Create the putFrame lock
283-
pKinesisVideoClient->base.putFrameLock = pKinesisVideoClient->clientCallbacks.createMutexFn(pKinesisVideoClient->clientCallbacks.customData, TRUE);
284+
pKinesisVideoClient->base.putFrameLock =
285+
pKinesisVideoClient->clientCallbacks.createMutexFn(pKinesisVideoClient->clientCallbacks.customData, TRUE);
284286

285287
// Create the state machine and step it
286288
CHK_STATUS(createStateMachine(CLIENT_STATE_MACHINE_STATES, CLIENT_STATE_MACHINE_STATE_COUNT, TO_CUSTOM_DATA(pKinesisVideoClient),
@@ -1811,7 +1813,7 @@ VOID createRandomName(PCHAR pName, UINT32 maxChars, GetRandomNumberFunc randFn,
18111813

18121814
for (i = 0; i < maxChars; i++) {
18131815
// Generate an alpha char
1814-
curChar = (CHAR)(randFn(customData) % (10 + 26));
1816+
curChar = (CHAR) (randFn(customData) % (10 + 26));
18151817
if (curChar <= 9) {
18161818
// Assign num
18171819
curChar += '0';

‎src/client/src/ClientState.c

Lines changed: 22 additions & 73 deletions
Original file line numberDiff line numberDiff line change
@@ -9,76 +9,26 @@
99
* Static definitions of the states
1010
*/
1111
StateMachineState CLIENT_STATE_MACHINE_STATES[] = {
12-
{
13-
CLIENT_STATE_NEW,
14-
CLIENT_STATE_NONE | CLIENT_STATE_NEW,
15-
fromNewClientState,
16-
executeNewClientState,
17-
defaultClientStateTransitionHook,
18-
INFINITE_RETRY_COUNT_SENTINEL,
19-
STATUS_INVALID_CLIENT_READY_STATE
20-
},
21-
{
22-
CLIENT_STATE_AUTH,
23-
CLIENT_STATE_READY | CLIENT_STATE_NEW | CLIENT_STATE_AUTH,
24-
fromAuthClientState,
25-
executeAuthClientState,
26-
defaultClientStateTransitionHook,
27-
SERVICE_CALL_MAX_RETRY_COUNT,
28-
STATUS_CLIENT_AUTH_CALL_FAILED
29-
},
30-
{
31-
CLIENT_STATE_GET_TOKEN,
32-
CLIENT_STATE_AUTH | CLIENT_STATE_PROVISION | CLIENT_STATE_GET_TOKEN,
33-
fromGetTokenClientState,
34-
executeGetTokenClientState,
35-
defaultClientStateTransitionHook,
36-
SERVICE_CALL_MAX_RETRY_COUNT,
37-
STATUS_GET_CLIENT_TOKEN_CALL_FAILED
38-
},
39-
{
40-
CLIENT_STATE_PROVISION,
41-
CLIENT_STATE_AUTH | CLIENT_STATE_PROVISION,
42-
fromProvisionClientState,
43-
executeProvisionClientState,
44-
defaultClientStateTransitionHook,
45-
SERVICE_CALL_MAX_RETRY_COUNT,
46-
STATUS_CLIENT_PROVISION_CALL_FAILED
47-
},
48-
{
49-
CLIENT_STATE_CREATE,
50-
CLIENT_STATE_PROVISION | CLIENT_STATE_GET_TOKEN | CLIENT_STATE_AUTH | CLIENT_STATE_CREATE,
51-
fromCreateClientState,
52-
executeCreateClientState,
53-
defaultClientStateTransitionHook,
54-
SERVICE_CALL_MAX_RETRY_COUNT,
55-
STATUS_CREATE_CLIENT_CALL_FAILED
56-
},
57-
{
58-
CLIENT_STATE_TAG_CLIENT,
59-
CLIENT_STATE_CREATE | CLIENT_STATE_TAG_CLIENT | CLIENT_STATE_READY,
60-
fromTagClientState,
61-
executeTagClientState,
62-
defaultClientStateTransitionHook,
63-
SERVICE_CALL_MAX_RETRY_COUNT,
64-
STATUS_TAG_CLIENT_CALL_FAILED
65-
},
66-
{
67-
CLIENT_STATE_READY,
68-
CLIENT_STATE_GET_TOKEN | CLIENT_STATE_AUTH | CLIENT_STATE_TAG_CLIENT | CLIENT_STATE_CREATE | CLIENT_STATE_READY,
69-
fromReadyClientState,
70-
executeReadyClientState,
71-
defaultClientStateTransitionHook,
72-
INFINITE_RETRY_COUNT_SENTINEL,
73-
STATUS_CLIENT_READY_CALLBACK_FAILED
74-
}
75-
};
12+
{CLIENT_STATE_NEW, CLIENT_STATE_NONE | CLIENT_STATE_NEW, fromNewClientState, executeNewClientState, defaultClientStateTransitionHook,
13+
INFINITE_RETRY_COUNT_SENTINEL, STATUS_INVALID_CLIENT_READY_STATE},
14+
{CLIENT_STATE_AUTH, CLIENT_STATE_READY | CLIENT_STATE_NEW | CLIENT_STATE_AUTH, fromAuthClientState, executeAuthClientState,
15+
defaultClientStateTransitionHook, SERVICE_CALL_MAX_RETRY_COUNT, STATUS_CLIENT_AUTH_CALL_FAILED},
16+
{CLIENT_STATE_GET_TOKEN, CLIENT_STATE_AUTH | CLIENT_STATE_PROVISION | CLIENT_STATE_GET_TOKEN, fromGetTokenClientState, executeGetTokenClientState,
17+
defaultClientStateTransitionHook, SERVICE_CALL_MAX_RETRY_COUNT, STATUS_GET_CLIENT_TOKEN_CALL_FAILED},
18+
{CLIENT_STATE_PROVISION, CLIENT_STATE_AUTH | CLIENT_STATE_PROVISION, fromProvisionClientState, executeProvisionClientState,
19+
defaultClientStateTransitionHook, SERVICE_CALL_MAX_RETRY_COUNT, STATUS_CLIENT_PROVISION_CALL_FAILED},
20+
{CLIENT_STATE_CREATE, CLIENT_STATE_PROVISION | CLIENT_STATE_GET_TOKEN | CLIENT_STATE_AUTH | CLIENT_STATE_CREATE, fromCreateClientState,
21+
executeCreateClientState, defaultClientStateTransitionHook, SERVICE_CALL_MAX_RETRY_COUNT, STATUS_CREATE_CLIENT_CALL_FAILED},
22+
{CLIENT_STATE_TAG_CLIENT, CLIENT_STATE_CREATE | CLIENT_STATE_TAG_CLIENT | CLIENT_STATE_READY, fromTagClientState, executeTagClientState,
23+
defaultClientStateTransitionHook, SERVICE_CALL_MAX_RETRY_COUNT, STATUS_TAG_CLIENT_CALL_FAILED},
24+
{CLIENT_STATE_READY, CLIENT_STATE_GET_TOKEN | CLIENT_STATE_AUTH | CLIENT_STATE_TAG_CLIENT | CLIENT_STATE_CREATE | CLIENT_STATE_READY,
25+
fromReadyClientState, executeReadyClientState, defaultClientStateTransitionHook, INFINITE_RETRY_COUNT_SENTINEL,
26+
STATUS_CLIENT_READY_CALLBACK_FAILED}};
7627

7728
UINT32 CLIENT_STATE_MACHINE_STATE_COUNT = SIZEOF(CLIENT_STATE_MACHINE_STATES) / SIZEOF(StateMachineState);
7829

79-
STATUS defaultClientStateTransitionHook(
80-
UINT64 customData /* customData should be PKinesisVideoClient */,
81-
PUINT64 stateTransitionWaitTime) {
30+
STATUS defaultClientStateTransitionHook(UINT64 customData /* customData should be PKinesisVideoClient */, PUINT64 stateTransitionWaitTime)
31+
{
8232
ENTERS();
8333
STATUS retStatus = STATUS_SUCCESS;
8434
PKinesisVideoClient pKinesisVideoClient = NULL;
@@ -96,13 +46,12 @@ STATUS defaultClientStateTransitionHook(
9646
// result != SERVICE_CALL_RESULT_NOT_SET and != SERVICE_CALL_RESULT_OK
9747
// If we support any other 2xx service call results, the condition
9848
// should change to (pKinesisVideoStream->base.result > 299 && ...)
99-
CHK(pKinesisVideoClient->base.result > SERVICE_CALL_RESULT_OK &&
100-
pKvsRetryStrategy != NULL &&
101-
pKvsRetryStrategy->pRetryStrategy != NULL &&
102-
pKvsRetryStrategyCallbacks->executeRetryStrategyFn != NULL, STATUS_SUCCESS);
49+
CHK(pKinesisVideoClient->base.result > SERVICE_CALL_RESULT_OK && pKvsRetryStrategy != NULL && pKvsRetryStrategy->pRetryStrategy != NULL &&
50+
pKvsRetryStrategyCallbacks->executeRetryStrategyFn != NULL,
51+
STATUS_SUCCESS);
10352

104-
DLOGV("KinesisVideoClient base result is [%u]. Executing KVS retry handler of retry strategy type [%u]",
105-
pKinesisVideoClient->base.result, pKvsRetryStrategy->retryStrategyType);
53+
DLOGV("KinesisVideoClient base result is [%u]. Executing KVS retry handler of retry strategy type [%u]", pKinesisVideoClient->base.result,
54+
pKvsRetryStrategy->retryStrategyType);
10655

10756
pKvsRetryStrategyCallbacks->executeRetryStrategyFn(pKvsRetryStrategy, &retryWaitTime);
10857
*stateTransitionWaitTime = retryWaitTime;

‎src/client/src/FrameOrderCoordinator.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -305,7 +305,7 @@ STATUS frameOrderCoordinatorPutFrame(PKinesisVideoStream pKinesisVideoStream, PF
305305
CHK(NULL != (pFrame = (PFrame) MEMALLOC(overallSize)), STATUS_NOT_ENOUGH_MEMORY);
306306

307307
*pFrame = *pUserFrame;
308-
pFrame->frameData = (PBYTE)(pFrame + 1);
308+
pFrame->frameData = (PBYTE) (pFrame + 1);
309309
MEMCPY(pFrame->frameData, pUserFrame->frameData, pUserFrame->size);
310310

311311
CHK_STATUS(stackQueueEnqueue(pPutFrameTrackData->frameQueue, (UINT64) pFrame));

‎src/client/src/Include_i.h

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -111,14 +111,14 @@ typedef STATUS (*KinesisVideoClientCallbackHookFunc)(UINT64);
111111
/**
112112
* Kinesis Video client states definitions
113113
*/
114-
#define CLIENT_STATE_NONE ((UINT64) 0) // 0x00
115-
#define CLIENT_STATE_NEW ((UINT64)(1 << 0)) // 0x01
116-
#define CLIENT_STATE_AUTH ((UINT64)(1 << 1)) // 0x02
117-
#define CLIENT_STATE_PROVISION ((UINT64)(1 << 2)) // 0x04
118-
#define CLIENT_STATE_GET_TOKEN ((UINT64)(1 << 3)) // 0x08
119-
#define CLIENT_STATE_CREATE ((UINT64)(1 << 4)) // 0x10
120-
#define CLIENT_STATE_TAG_CLIENT ((UINT64)(1 << 5)) // 0x20
121-
#define CLIENT_STATE_READY ((UINT64)(1 << 6)) // 0x40
114+
#define CLIENT_STATE_NONE ((UINT64) 0) // 0x00
115+
#define CLIENT_STATE_NEW ((UINT64) (1 << 0)) // 0x01
116+
#define CLIENT_STATE_AUTH ((UINT64) (1 << 1)) // 0x02
117+
#define CLIENT_STATE_PROVISION ((UINT64) (1 << 2)) // 0x04
118+
#define CLIENT_STATE_GET_TOKEN ((UINT64) (1 << 3)) // 0x08
119+
#define CLIENT_STATE_CREATE ((UINT64) (1 << 4)) // 0x10
120+
#define CLIENT_STATE_TAG_CLIENT ((UINT64) (1 << 5)) // 0x20
121+
#define CLIENT_STATE_READY ((UINT64) (1 << 6)) // 0x40
122122

123123
/**
124124
* Object identifier enum - these will serve as sentinel values to identify
@@ -136,17 +136,17 @@ typedef STATUS (*KinesisVideoClientCallbackHookFunc)(UINT64);
136136
/**
137137
* Macros to convert to and from handle
138138
*/
139-
#define TO_CLIENT_HANDLE(p) ((CLIENT_HANDLE)(p))
140-
#define FROM_CLIENT_HANDLE(h) (IS_VALID_CLIENT_HANDLE(h) ? (PKinesisVideoClient)(h) : NULL)
139+
#define TO_CLIENT_HANDLE(p) ((CLIENT_HANDLE) (p))
140+
#define FROM_CLIENT_HANDLE(h) (IS_VALID_CLIENT_HANDLE(h) ? (PKinesisVideoClient) (h) : NULL)
141141

142142
#define TO_STREAM_HANDLE(p) (toStreamHandle(p))
143143
#define FROM_STREAM_HANDLE(h) (fromStreamHandle(h))
144144

145-
#define TO_CUSTOM_DATA(p) ((UINT64)(p))
146-
#define STREAM_FROM_CUSTOM_DATA(h) ((PKinesisVideoStream)(h))
147-
#define CLIENT_FROM_CUSTOM_DATA(h) ((PKinesisVideoClient)(h))
145+
#define TO_CUSTOM_DATA(p) ((UINT64) (p))
146+
#define STREAM_FROM_CUSTOM_DATA(h) ((PKinesisVideoStream) (h))
147+
#define CLIENT_FROM_CUSTOM_DATA(h) ((PKinesisVideoClient) (h))
148148

149-
#define KINESIS_VIDEO_OBJECT_IDENTIFIER_FROM_CUSTOM_DATA(h) ((UINT32) * (PUINT32)(h))
149+
#define KINESIS_VIDEO_OBJECT_IDENTIFIER_FROM_CUSTOM_DATA(h) ((UINT32) * (PUINT32) (h))
150150

151151
/**
152152
* Default heap flags

‎src/client/src/InputValidator.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -333,19 +333,19 @@ VOID fixupClientInfo(PClientInfo pClientInfo, PClientInfo pOrigClientInfo)
333333
}
334334
}
335335

336-
if(pClientInfo->serviceCallConnectionTimeout > pClientInfo->serviceCallCompletionTimeout) {
336+
if (pClientInfo->serviceCallConnectionTimeout > pClientInfo->serviceCallCompletionTimeout) {
337337
DLOGW("Completion timeout should be more than connection timeout...setting to defaults");
338338
pClientInfo->serviceCallConnectionTimeout = SERVICE_CALL_DEFAULT_CONNECTION_TIMEOUT;
339339
pClientInfo->serviceCallCompletionTimeout = SERVICE_CALL_DEFAULT_TIMEOUT;
340340
}
341341

342-
if(pClientInfo->serviceCallConnectionTimeout == 0 || !IS_VALID_TIMESTAMP(pClientInfo->serviceCallConnectionTimeout)) {
342+
if (pClientInfo->serviceCallConnectionTimeout == 0 || !IS_VALID_TIMESTAMP(pClientInfo->serviceCallConnectionTimeout)) {
343343
// Although curl sets default if the value is 0, the default is 300 seconds (5 minutes) which is very high
344344
DLOGW("Connection timeout is invalid...setting to default");
345345
pClientInfo->serviceCallConnectionTimeout = SERVICE_CALL_DEFAULT_CONNECTION_TIMEOUT;
346346
}
347347

348-
if(pClientInfo->serviceCallCompletionTimeout == 0 || !IS_VALID_TIMESTAMP(pClientInfo->serviceCallCompletionTimeout)) {
348+
if (pClientInfo->serviceCallCompletionTimeout == 0 || !IS_VALID_TIMESTAMP(pClientInfo->serviceCallCompletionTimeout)) {
349349
DLOGW("Completion timeout is invalid...setting to default");
350350
// If 0, it means there is no timeout on completion of the curl call which could be dangerous
351351
pClientInfo->serviceCallCompletionTimeout = SERVICE_CALL_DEFAULT_TIMEOUT;

0 commit comments

Comments
 (0)