Skip to content

Commit 33a77d8

Browse files
committed
Fix(NetworkEvents): Don't skip event callbacks in NetworkEvents::removeEvent
Fixes Issue 10318 Includes pull request 10321 that fixes 10316 This change: * Adds code to find the event callbacks * Issues warning when duplicate callbacks insertion attempts are made * Issues warning when callbacks are not found during removal
1 parent 0c8809e commit 33a77d8

File tree

1 file changed

+10
-10
lines changed

1 file changed

+10
-10
lines changed

libraries/Network/src/NetworkEvents.cpp

+10-10
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@ network_event_handle_t NetworkEvents::onEvent(NetworkEventCb cbEvent, arduino_ev
197197
}
198198

199199
if (findEvent(cbEvent, event) < cbEventList.size()) {
200-
log_e("Attempt to add duplicate event handler!");
200+
log_w("Attempt to add duplicate event handler!");
201201
return 0;
202202
}
203203

@@ -216,7 +216,7 @@ network_event_handle_t NetworkEvents::onEvent(NetworkEventFuncCb cbEvent, arduin
216216
}
217217

218218
if (findEvent(cbEvent, event) < cbEventList.size()) {
219-
log_e("Attempt to add duplicate event handler!");
219+
log_w("Attempt to add duplicate event handler!");
220220
return 0;
221221
}
222222

@@ -235,7 +235,7 @@ network_event_handle_t NetworkEvents::onEvent(NetworkEventSysCb cbEvent, arduino
235235
}
236236

237237
if (findEvent(cbEvent, event) < cbEventList.size()) {
238-
log_e("Attempt to add duplicate event handler!");
238+
log_w("Attempt to add duplicate event handler!");
239239
return 0;
240240
}
241241

@@ -254,7 +254,7 @@ network_event_handle_t NetworkEvents::onSysEvent(NetworkEventCb cbEvent, arduino
254254
}
255255

256256
if (findEvent(cbEvent, event) < cbEventList.size()) {
257-
log_e("Attempt to add duplicate event handler!");
257+
log_w("Attempt to add duplicate event handler!");
258258
return 0;
259259
}
260260

@@ -273,7 +273,7 @@ network_event_handle_t NetworkEvents::onSysEvent(NetworkEventFuncCb cbEvent, ard
273273
}
274274

275275
if (findEvent(cbEvent, event) < cbEventList.size()) {
276-
log_e("Attempt to add duplicate event handler!");
276+
log_w("Attempt to add duplicate event handler!");
277277
return 0;
278278
}
279279

@@ -292,7 +292,7 @@ network_event_handle_t NetworkEvents::onSysEvent(NetworkEventSysCb cbEvent, ardu
292292
}
293293

294294
if (findEvent(cbEvent, event) < cbEventList.size()) {
295-
log_e("Attempt to add duplicate event handler!");
295+
log_w("Attempt to add duplicate event handler!");
296296
return 0;
297297
}
298298

@@ -314,7 +314,7 @@ void NetworkEvents::removeEvent(NetworkEventCb cbEvent, arduino_event_id_t event
314314

315315
i = findEvent(cbEvent, event);
316316
if (i >= cbEventList.size()) {
317-
log_e("Event handler not found!");
317+
log_w("Event handler not found!");
318318
return;
319319
}
320320

@@ -330,7 +330,7 @@ void NetworkEvents::removeEvent(NetworkEventFuncCb cbEvent, arduino_event_id_t e
330330

331331
i = findEvent(cbEvent, event);
332332
if (i >= cbEventList.size()) {
333-
log_e("Event handler not found!");
333+
log_w("Event handler not found!");
334334
return;
335335
}
336336

@@ -346,7 +346,7 @@ void NetworkEvents::removeEvent(NetworkEventSysCb cbEvent, arduino_event_id_t ev
346346

347347
i = findEvent(cbEvent, event);
348348
if (i >= cbEventList.size()) {
349-
log_e("Event handler not found!");
349+
log_w("Event handler not found!");
350350
return;
351351
}
352352

@@ -361,7 +361,7 @@ void NetworkEvents::removeEvent(network_event_handle_t id) {
361361
return;
362362
}
363363
}
364-
log_e("Event handler not found!");
364+
log_w("Event handler not found!");
365365
}
366366

367367
int NetworkEvents::setStatusBits(int bits) {

0 commit comments

Comments
 (0)