change(RemoteChar): Cleanup descriptorDiscCB

Author: thekurtovic

src/NimBLERemoteCharacteristic.cpp

@@ -67,20 +67,20 @@ int NimBLERemoteCharacteristic::descriptorDiscCB(
     int rc = error->status;
     NIMBLE_LOGD(LOG_TAG, "Descriptor Discovery >> status: %d handle: %d", rc, (rc == 0) ? dsc->handle : -1);
 
-    auto              filter     = (desc_filter_t*)arg;
-    auto              pTaskData  = (NimBLETaskData*)filter->task_data;
-    const auto        pChr       = (NimBLERemoteCharacteristic*)pTaskData->m_pInstance;
-    const NimBLEUUID* uuidFilter = filter->uuid;
+    auto       filter    = (desc_filter_t*)arg;
+    auto       pTaskData = (NimBLETaskData*)filter->task_data;
+    const auto pChr      = (NimBLERemoteCharacteristic*)pTaskData->m_pInstance;
+    const auto uuid      = filter->uuid; // UUID to filter for
 
     if (pChr->getHandle() != chrHandle) {
         return 0; // Descriptor not for this characteristic
     }
-    // Return early if not the descriptor we are looking for if filter exists.
-    if (rc != 0 || (uuidFilter && ble_uuid_cmp(uuidFilter->getBase(), &dsc->uuid.u))) {
+    // Return early if not the descriptor we are looking for if filter exists
+    if (rc != 0 || (uuid && ble_uuid_cmp(uuid->getBase(), &dsc->uuid.u))) {
         goto Done;
     }
 
-    rc = !!uuidFilter * BLE_HS_EDONE; // If found the descriptor, stop the search
+    rc = !!uuid * BLE_HS_EDONE; // If found the descriptor, stop the search
     pChr->m_vDescriptors.push_back(new NimBLERemoteDescriptor(pChr, dsc));
 
 Done: