NimBLEL2CAP: Refactor to support C++ 11 as requested by review h2zero#324.

Author: mickeyl

src/NimBLEL2CAPChannel.cpp

@@ -47,11 +47,14 @@ bool NimBLEL2CAPChannel::setupMemPool() {
         return false;
     }
 
-    if (auto rc = os_mempool_init(&_coc_mempool, buf_blocks, L2CAP_BUF_BLOCK_SIZE, _coc_memory, "appbuf"); rc != 0) {
+    auto rc = os_mempool_init(&_coc_mempool, buf_blocks, L2CAP_BUF_BLOCK_SIZE, _coc_memory, "appbuf");
+    if (rc != 0) {
         NIMBLE_LOGE(LOG_TAG, "Can't os_mempool_init: %d", rc);
         return false;
     }
-    if (auto rc = os_mbuf_pool_init(&_coc_mbuf_pool, &_coc_mempool, L2CAP_BUF_BLOCK_SIZE, buf_blocks); rc != 0) {
+
+    auto rc2 = os_mbuf_pool_init(&_coc_mbuf_pool, &_coc_mempool, L2CAP_BUF_BLOCK_SIZE, buf_blocks);
+    if (rc2 != 0) {
         NIMBLE_LOGE(LOG_TAG, "Can't os_mbuf_pool_init: %d", rc);
         return false;
     }

src/NimBLEL2CAPChannel.h

@@ -74,7 +74,7 @@ class NimBLEL2CAPChannel {
     struct os_mbuf_pool _coc_mbuf_pool;
 
     // Runtime handling
-    std::atomic<bool> stalled = false;
+    std::atomic<bool> stalled{false};
     SemaphoreHandle_t stalledSemaphore = nullptr;
 
     // Allocate / deallocate NimBLE memory pool
@@ -112,4 +112,4 @@ class NimBLEL2CAPChannelCallbacks {
     virtual void onDisconnect(NimBLEL2CAPChannel* channel) {};
 };
 
-#endif
+#endif

src/NimBLEL2CAPServer.cpp

@@ -24,12 +24,13 @@ NimBLEL2CAPServer::~NimBLEL2CAPServer() {
 NimBLEL2CAPChannel* NimBLEL2CAPServer::createService(const uint16_t psm, const uint16_t mtu, NimBLEL2CAPChannelCallbacks* callbacks) {
 
     auto service = new NimBLEL2CAPChannel(psm, mtu, callbacks);
+    auto rc = ble_l2cap_create_server(psm, mtu, NimBLEL2CAPChannel::handleL2capEvent, service);
 
-    if (auto rc = ble_l2cap_create_server(psm, mtu, NimBLEL2CAPChannel::handleL2capEvent, service); rc != 0) {
+    if (rc != 0) {
         NIMBLE_LOGE(LOG_TAG, "Could not ble_l2cap_create_server: %d", rc);
         return nullptr;
     }
 
     this->services.push_back(service);
-    return service;    
+    return service;
 }