Skip to content

Commit 59642e9

Browse files
committed
Since the cloud event callback argument is never used the void * parameter for is removed
1 parent 3b10401 commit 59642e9

File tree

4 files changed

+11
-11
lines changed

4 files changed

+11
-11
lines changed

src/ArduinoIoTCloud.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -150,10 +150,10 @@ ArduinoCloudProperty& ArduinoIoTCloudClass::addPropertyReal(String& property, St
150150
* PRIVATE MEMBER FUNCTIONS
151151
******************************************************************************/
152152

153-
void ArduinoIoTCloudClass::execCloudEventCallback(OnCloudEventCallback& callback, void* callback_arg)
153+
void ArduinoIoTCloudClass::execCloudEventCallback(OnCloudEventCallback& callback)
154154
{
155155
if (callback) {
156-
(*callback)(callback_arg);
156+
(*callback)();
157157
}
158158
}
159159

src/ArduinoIoTCloud.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ enum class ArduinoIoTCloudEvent
6767
SYNC, CONNECT, DISCONNECT
6868
};
6969

70-
typedef void (*OnCloudEventCallback)(void * /* arg */);
70+
typedef void (*OnCloudEventCallback)(void);
7171

7272
/******************************************************************************
7373
* CLASS DECLARATION
@@ -138,7 +138,7 @@ class ArduinoIoTCloudClass
138138
OnCloudEventCallback _on_connect_event_callback = NULL;
139139
OnCloudEventCallback _on_disconnect_event_callback = NULL;
140140

141-
static void execCloudEventCallback(OnCloudEventCallback & callback, void * callback_arg);
141+
static void execCloudEventCallback(OnCloudEventCallback & callback);
142142
static void printConnectionStatus(ArduinoIoTConnectionStatus status);
143143

144144
private:

src/ArduinoIoTCloudLPWAN.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ void ArduinoIoTCloudLPWAN::update() {
9191
sendPropertiesToCloud();
9292

9393

94-
execCloudEventCallback(_on_sync_event_callback, 0 /* callback_arg */);
94+
execCloudEventCallback(_on_sync_event_callback);
9595

9696
}
9797

@@ -124,7 +124,7 @@ ArduinoIoTConnectionStatus ArduinoIoTCloudLPWAN::connectionCheck() {
124124
if (_connection->getStatus() != NetworkConnectionState::CONNECTED) {
125125
_iotStatus = ArduinoIoTConnectionStatus::DISCONNECTED;
126126
printConnectionStatus(_iotStatus);
127-
execCloudEventCallback(_on_disconnect_event_callback, 0 /* callback_arg - e.g. could be error code casted to void * */);
127+
execCloudEventCallback(_on_disconnect_event_callback);
128128
}
129129
}
130130
break;
@@ -150,7 +150,7 @@ ArduinoIoTConnectionStatus ArduinoIoTCloudLPWAN::connectionCheck() {
150150
if (net_status == NetworkConnectionState::CONNECTED) {
151151
_iotStatus = ArduinoIoTConnectionStatus::CONNECTED;
152152
printConnectionStatus(_iotStatus);
153-
execCloudEventCallback(_on_connect_event_callback, 0 /* callback_arg */);
153+
execCloudEventCallback(_on_connect_event_callback);
154154
}
155155

156156
}

src/ArduinoIoTCloudTCP.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@ void ArduinoIoTCloudTCP::update() {
188188
}
189189
break;
190190
case ArduinoIoTSynchronizationStatus::SYNC_STATUS_VALUES_PROCESSED: {
191-
execCloudEventCallback(_on_sync_event_callback, 0 /* callback_arg */);
191+
execCloudEventCallback(_on_sync_event_callback);
192192
_syncStatus = ArduinoIoTSynchronizationStatus::SYNC_STATUS_SYNCHRONIZED;
193193
}
194194
break;
@@ -302,7 +302,7 @@ ArduinoIoTConnectionStatus ArduinoIoTCloudTCP::checkCloudConnection()
302302
_iotStatus = ArduinoIoTConnectionStatus::DISCONNECTED;
303303
_mqtt_data_request_retransmit = true;
304304
printConnectionStatus(_iotStatus);
305-
execCloudEventCallback(_on_disconnect_event_callback, 0 /* callback_arg - e.g. could be error code casted to void * */);
305+
execCloudEventCallback(_on_disconnect_event_callback);
306306
}
307307
}
308308
break;
@@ -317,7 +317,7 @@ ArduinoIoTConnectionStatus ArduinoIoTCloudTCP::checkCloudConnection()
317317
if (ret_code_reconnect == CONNECT_SUCCESS) {
318318
_iotStatus = ArduinoIoTConnectionStatus::CONNECTED;
319319
printConnectionStatus(_iotStatus);
320-
execCloudEventCallback(_on_connect_event_callback, 0 /* callback_arg */);
320+
execCloudEventCallback(_on_connect_event_callback);
321321
CloudSerial.begin(9600);
322322
CloudSerial.println("Hello from Cloud Serial!");
323323
}
@@ -329,7 +329,7 @@ ArduinoIoTConnectionStatus ArduinoIoTCloudTCP::checkCloudConnection()
329329
if (ret_code_connect == CONNECT_SUCCESS) {
330330
_iotStatus = ArduinoIoTConnectionStatus::CONNECTED;
331331
printConnectionStatus(_iotStatus);
332-
execCloudEventCallback(_on_connect_event_callback, 0 /* callback_arg */);
332+
execCloudEventCallback(_on_connect_event_callback);
333333
CloudSerial.begin(9600);
334334
CloudSerial.println("Hello from Cloud Serial!");
335335
} else if (ret_code_connect == CONNECT_FAILURE_SUBSCRIBE) {

0 commit comments

Comments
 (0)