Skip to content

Commit 10f64b3

Browse files
committed
Update ChainableGattServerEventHandler to be consistent with const reference parameters
1 parent 606dff9 commit 10f64b3

File tree

2 files changed

+14
-14
lines changed

2 files changed

+14
-14
lines changed

connectivity/FEATURE_BLE/include/ble/gatt/ChainableGattServerEventHandler.h

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -42,31 +42,31 @@ class ChainableGattServerEventHandler : public ble::GattServer::EventHandler,
4242
connectionHandle, attMtuSize);
4343
}
4444

45-
void onDataSent(const GattDataSentCallbackParams* params) override {
45+
void onDataSent(const GattDataSentCallbackParams &params) override {
4646
execute_on_all(&ble::GattServer::EventHandler::onDataSent, params);
4747
}
4848

49-
void onDataWritten(const GattWriteCallbackParams *params) override {
49+
void onDataWritten(const GattWriteCallbackParams &params) override {
5050
execute_on_all(&ble::GattServer::EventHandler::onDataWritten, params);
5151
}
5252

53-
void onDataRead(const GattReadCallbackParams *params) override {
53+
void onDataRead(const GattReadCallbackParams &params) override {
5454
execute_on_all(&ble::GattServer::EventHandler::onDataRead, params);
5555
}
5656

57-
void onShutdown(const GattServer *server) override {
57+
void onShutdown(const GattServer &server) override {
5858
execute_on_all(&ble::GattServer::EventHandler::onShutdown, server);
5959
}
6060

61-
void onUpdatesEnabled(const GattUpdatesEnabledCallbackParams* params) override {
61+
void onUpdatesEnabled(const GattUpdatesEnabledCallbackParams &params) override {
6262
execute_on_all(&ble::GattServer::EventHandler::onUpdatesEnabled, params);
6363
}
6464

65-
void onUpdatesDisabled(const GattUpdatesDisabledCallbackParams* params) override {
65+
void onUpdatesDisabled(const GattUpdatesDisabledCallbackParams &params) override {
6666
execute_on_all(&ble::GattServer::EventHandler::onUpdatesDisabled, params);
6767
}
6868

69-
void onConfirmationReceived(const GattConfirmationReceivedCallbackParams* params) override {
69+
void onConfirmationReceived(const GattConfirmationReceivedCallbackParams &params) override {
7070
execute_on_all(&ble::GattServer::EventHandler::onConfirmationReceived, params);
7171
}
7272

connectivity/FEATURE_BLE/source/cordio/source/GattServerImpl.cpp

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -879,7 +879,7 @@ ble_error_t GattServer::reset(ble::GattServer* server)
879879
{
880880
/* Notify that the instance is about to shutdown */
881881
if(eventHandler) {
882-
eventHandler->onShutdown(server);
882+
eventHandler->onShutdown(*server);
883883
}
884884

885885
// Execute callbacks added with deprecated API
@@ -1487,7 +1487,7 @@ GattServer::EventHandler *GattServer::getEventHandler()
14871487
void GattServer::handleDataWrittenEvent(const GattWriteCallbackParams *params)
14881488
{
14891489
if(eventHandler) {
1490-
eventHandler->onDataWritten(params);
1490+
eventHandler->onDataWritten(*params);
14911491
}
14921492

14931493
// Execute callbacks added with deprecated API
@@ -1497,7 +1497,7 @@ void GattServer::handleDataWrittenEvent(const GattWriteCallbackParams *params)
14971497
void GattServer::handleDataReadEvent(const GattReadCallbackParams *params)
14981498
{
14991499
if(eventHandler) {
1500-
eventHandler->onDataRead(params);
1500+
eventHandler->onDataRead(*params);
15011501
}
15021502

15031503
// Execute callbacks added with deprecated API
@@ -1518,7 +1518,7 @@ void GattServer::handleEvent(
15181518
.connHandle = connHandle,
15191519
.attHandle = attributeHandle
15201520
});
1521-
eventHandler->onUpdatesEnabled(&params);
1521+
eventHandler->onUpdatesEnabled(params);
15221522
}
15231523

15241524
// Execute deprecated callback
@@ -1533,7 +1533,7 @@ void GattServer::handleEvent(
15331533
.connHandle = connHandle,
15341534
.attHandle = attributeHandle
15351535
});
1536-
eventHandler->onUpdatesDisabled(&params);
1536+
eventHandler->onUpdatesDisabled(params);
15371537
}
15381538

15391539
// Execute deprecated callback
@@ -1548,7 +1548,7 @@ void GattServer::handleEvent(
15481548
.connHandle = connHandle,
15491549
.attHandle = attributeHandle
15501550
});
1551-
eventHandler->onConfirmationReceived(&params);
1551+
eventHandler->onConfirmationReceived(params);
15521552
}
15531553

15541554
// Execute deprecated callback
@@ -1564,7 +1564,7 @@ void GattServer::handleEvent(
15641564
.connHandle = connHandle,
15651565
.attHandle = attributeHandle
15661566
});
1567-
eventHandler->onDataSent(&params);
1567+
eventHandler->onDataSent(params);
15681568
}
15691569

15701570
// Execute deprecated callback

0 commit comments

Comments
 (0)