BLE: Clang tidy on public headers.

Author: pan-

connectivity/FEATURE_BLE/include/ble/BLE.h

@@ -154,6 +154,10 @@ class BLE {
      */
     static const InstanceID_t NUM_INSTANCES = 1;
 
+    // Prevent copy construction and copy assignment of BLE.
+    BLE(const BLE &) = delete;
+    BLE &operator=(const BLE &) = delete;
+
     /**
      * Get a reference to the BLE singleton.
      *
@@ -193,7 +197,7 @@ class BLE {
      */
     MBED_DEPRECATED_SINCE("mbed-os-6.3.0", "BLE singleton supports one instance. You may create multiple"
                           "instances by using the constructor.")
-    InstanceID_t getInstanceID(void) const
+    InstanceID_t getInstanceID() const
     {
         return DEFAULT_INSTANCE;
     }
@@ -299,7 +303,7 @@ class BLE {
      * @attention This should be called before using anything else in the BLE
      * API.
      */
-    ble_error_t init(InitializationCompleteCallback_t completion_cb = NULL)
+    ble_error_t init(InitializationCompleteCallback_t completion_cb = nullptr)
     {
         FunctionPointerWithContext<InitializationCompleteCallbackContext *> callback(completion_cb);
         return initImplementation(callback);
@@ -331,7 +335,7 @@ class BLE {
      * @note The application should set up a callback to signal completion of
      * initialization when using init().
      */
-    bool hasInitialized(void) const;
+    bool hasInitialized() const;
 
     /**
      * Shut down the underlying stack, and reset state of this BLE instance.
@@ -343,7 +347,7 @@ class BLE {
      * GAP state. This API offers a way to repopulate the GATT database with new
      * services and characteristics.
      */
-    ble_error_t shutdown(void);
+    ble_error_t shutdown();
 
     /**
      * This call allows the application to get the BLE stack version information.
@@ -352,7 +356,7 @@ class BLE {
      *
      * @note The BLE API owns the string returned.
      */
-    const char *getVersion(void);
+    const char *getVersion();
 
     /**
      * Accessor to Gap. All Gap-related functionality requires going through
@@ -465,11 +469,6 @@ class BLE {
         FunctionPointerWithContext<InitializationCompleteCallbackContext *> callback
     );
 
-private:
-    // Prevent copy construction and copy assignment of BLE.
-    BLE(const BLE &) = delete;
-    BLE &operator=(const BLE &) = delete;
-
 private:
     ble::BLEInstanceBase &transport; /* The device-specific backend */
     OnEventsToProcessCallback_t whenEventsToProcess;

connectivity/FEATURE_BLE/include/ble/Gap.h

@@ -549,9 +549,7 @@ class Gap {
          * Prevent polymorphic deletion and avoid unnecessary virtual destructor
          * as the Gap class will never delete the instance it contains.
          */
-        ~EventHandler()
-        {
-        }
+        ~EventHandler() = default;
     };
 
     /**
@@ -1316,7 +1314,7 @@ class Gap {
      *
      * @return Maximum size of the whitelist.
      */
-    uint8_t getMaxWhitelistSize(void) const;
+    uint8_t getMaxWhitelistSize() const;
 
     /**
      * Get the Link Layer to use the internal whitelist when scanning,
@@ -1379,7 +1377,7 @@ class Gap {
      * the address in input was not identifiable as a random address.
      */
     static ble_error_t getRandomAddressType(
-        const ble::address_t address,
+        ble::address_t address,
         ble::random_address_type_t *addressType
     );
 
@@ -1401,7 +1399,7 @@ class Gap {
      * @note Currently, a call to reset() does not reset the advertising and
      * scan parameters to default values.
      */
-    ble_error_t reset(void);
+    ble_error_t reset();
 
         /**
      * Register a Gap shutdown event handler.

connectivity/FEATURE_BLE/include/ble/GattClient.h

@@ -120,9 +120,7 @@ class GattClient {
          * Prevent polymorphic deletion and avoid unnecessary virtual destructor
          * as the GattClient class will never delete the instance it contains.
          */
-        ~EventHandler()
-        {
-        }
+        ~EventHandler() = default;
     };
 
     /**
@@ -235,7 +233,7 @@ class GattClient {
      * specific subclass.
      */
 
-    ~GattClient() { }
+    ~GattClient() = default;
 
     /**
      * Launch the service and characteristic discovery procedure of a GATT server
@@ -289,8 +287,8 @@ class GattClient {
      */
     ble_error_t launchServiceDiscovery(
         ble::connection_handle_t connectionHandle,
-        ServiceDiscovery::ServiceCallback_t sc = NULL,
-        ServiceDiscovery::CharacteristicCallback_t  cc = NULL,
+        ServiceDiscovery::ServiceCallback_t sc = nullptr,
+        ServiceDiscovery::CharacteristicCallback_t  cc = nullptr,
         const UUID &matchingServiceUUID = UUID::ShortUUIDBytes_t(BLE_UUID_UNKNOWN),
         const UUID &matchingCharacteristicUUIDIn = UUID::ShortUUIDBytes_t(BLE_UUID_UNKNOWN)
     );
@@ -368,15 +366,15 @@ class GattClient {
      *
      * @return true if service discovery procedure is active and false otherwise.
      */
-    bool isServiceDiscoveryActive(void) const;
+    bool isServiceDiscoveryActive() const;
 
     /**
      * Terminate all ongoing service discovery procedures.
      *
      * It results in an invocation of the service discovery termination handler
      * registered with onServiceDiscoveryTermination().
      */
-    void terminateServiceDiscovery(void);
+    void terminateServiceDiscovery();
 
     /**
      * Initiate the read procedure of an attribute handle.
@@ -627,7 +625,10 @@ class GattClient {
      * available.
      */
     template <typename T>
-    void onShutdown(T *objPtr, void (T::*memberPtr)(const GattClient *));
+    void onShutdown(T *objPtr, void (T::*memberPtr)(const GattClient *))
+    {
+        onShutdown({objPtr, memberPtr});
+    }
 
     /**
      * Get the callchain of shutdown event handlers.
@@ -668,7 +669,7 @@ class GattClient {
      *
      * @return BLE_ERROR_NONE on success.
      */
-    ble_error_t reset(void);
+    ble_error_t reset();
 
     /* Entry points for the underlying stack to report events back to the user. */
 

connectivity/FEATURE_BLE/include/ble/GattServer.h

@@ -126,9 +126,7 @@ class GattServer {
          * Prevent polymorphic deletion and avoid unnecessary virtual destructor
          * as the GattServer class will never delete the instance it contains.
          */
-        ~EventHandler()
-        {
-        }
+        ~EventHandler() = default;
     };
 
     /**
@@ -224,7 +222,7 @@ class GattServer {
      *
      * @return BLE_ERROR_NONE on success.
      */
-    ble_error_t reset(void);
+    ble_error_t reset();
 
     /**
      * Add a service declaration to the local attribute server table.

connectivity/FEATURE_BLE/include/ble/SecurityManager.h

@@ -19,7 +19,7 @@
 #ifndef BLE_SECURITY_MANAGER_H_
 #define BLE_SECURITY_MANAGER_H_
 
-#include <stdint.h>
+#include <cstdint>
 #include "ble/common/CallChainOfFunctionPointersWithContext.h"
 #include "platform/Callback.h"
 
@@ -421,9 +421,7 @@ class SecurityManager
          * Prevent polymorphic deletion and avoid unnecessary virtual destructor
          * as the SecurityManager class will never delete the instance it contains.
          */
-        ~EventHandler()
-        {
-        }
+        ~EventHandler() = default;
     };
 
     /*
@@ -457,9 +455,9 @@ class SecurityManager
         bool                     enableBonding = true,
         bool                     requireMITM   = true,
         SecurityIOCapabilities_t iocaps        = IO_CAPS_NONE,
-        const Passkey_t          passkey       = NULL,
+        const Passkey_t          passkey       = nullptr,
         bool                     signing       = true,
-        const char              *dbFilepath    = NULL
+        const char              *dbFilepath    = nullptr
     );
 
     /**
@@ -473,7 +471,7 @@ class SecurityManager
      *
      * @return BLE_ERROR_NONE on success.
      */
-    ble_error_t setDatabaseFilepath(const char *dbFilepath = NULL);
+    ble_error_t setDatabaseFilepath(const char *dbFilepath = nullptr);
 
     /**
      * Notify all registered onShutdown callbacks that the SecurityManager is
@@ -488,7 +486,7 @@ class SecurityManager
      *
      * @return BLE_ERROR_NONE on success.
      */
-    ble_error_t reset(void);
+    ble_error_t reset();
 
     /**
      * Normally all bonding information is lost when device is reset, this requests that the stack
@@ -511,7 +509,7 @@ class SecurityManager
      * @retval BLE_ERROR_INVALID_STATE    If the API is called without module initialization or
      *                                    application registration.
      */
-    ble_error_t purgeAllBondingState(void);
+    ble_error_t purgeAllBondingState();
 
     /**
      * Create a list of addresses from all peers in the bond table and generate
@@ -870,7 +868,10 @@ class SecurityManager
     void onShutdown(const SecurityManagerShutdownCallback_t& callback);
 
     template <typename T>
-    void onShutdown(T *objPtr, void (T::*memberPtr)(const SecurityManager *));
+    void onShutdown(T *objPtr, void (T::*memberPtr)(const SecurityManager *))
+    {
+        onShutdown({objPtr, memberPtr});
+    }
 
     /**
      * Provide access to the callchain of shutdown event callbacks.

connectivity/FEATURE_BLE/include/ble/common/BLETypes.h

@@ -19,9 +19,9 @@
 #ifndef BLE_TYPES_H_
 #define BLE_TYPES_H_
 
-#include <stddef.h>
-#include <stdint.h>
-#include <string.h>
+#include <cstddef>
+#include <cstdint>
+#include <cstring>
 #include "ble/common/SafeEnum.h"
 #include "platform/Span.h"
 
@@ -872,7 +872,7 @@ struct whitelist_t {
          * @post type is equal to PUBLIC and the address value is equal to
          * 00:00:00:00:00:00
          */
-        entry_t(void) : type(), address() { }
+        entry_t() : type(), address() { }
 
         /**
          * Type of the peer address.

connectivity/FEATURE_BLE/include/ble/common/Bounded.h

@@ -19,7 +19,7 @@
 #ifndef BLE_COMMON_BOUNDED_H_
 #define BLE_COMMON_BOUNDED_H_
 
-#include <stdint.h>
+#include <cstdint>
 
 namespace ble {
 
@@ -47,9 +47,9 @@ struct Bounded {
     Bounded(Rep v) : _value(v)
     {
         if (v < Min) {
-            _value = v;
+            _value = Min;
         } else if (v > Max) {
-            _value = v;
+            _value = Max;
         }
     }
 

connectivity/FEATURE_BLE/include/ble/common/CallChainOfFunctionPointersWithContext.h

@@ -19,7 +19,7 @@
 #ifndef MBED_CALLCHAIN_OF_FUNCTION_POINTERS_WITH_CONTEXT_H
 #define MBED_CALLCHAIN_OF_FUNCTION_POINTERS_WITH_CONTEXT_H
 
-#include <string.h>
+#include <cstring>
 #include "ble/common/FunctionPointerWithContext.h"
 #include "ble/common/SafeBool.h"
 
@@ -96,6 +96,14 @@ class CallChainOfFunctionPointersWithContext :
      */
     CallChainOfFunctionPointersWithContext() : chainHead(NULL) { }
 
+    /* Disallow copy constructor and assignment operators. */
+    CallChainOfFunctionPointersWithContext(
+        const CallChainOfFunctionPointersWithContext&
+    ) = delete;
+    CallChainOfFunctionPointersWithContext &operator=(
+        const CallChainOfFunctionPointersWithContext&
+    ) = delete;
+
     /**
      * Destruction of the callchain.
      */
@@ -186,7 +194,7 @@ class CallChainOfFunctionPointersWithContext :
     /**
      * Remove all functions registered in the chain.
      */
-    void clear(void)
+    void clear()
     {
         pFunctionPointerWithContext_t fptr = chainHead;
         while (fptr) {
@@ -203,7 +211,7 @@ class CallChainOfFunctionPointersWithContext :
      *
      * @return true if the callchain is not empty and false otherwise.
      */
-    bool hasCallbacksAttached(void) const
+    bool hasCallbacksAttached() const
     {
         return (chainHead != NULL);
     }
@@ -324,16 +332,6 @@ class CallChainOfFunctionPointersWithContext :
      * const from an external standpoint.
      */
     mutable pFunctionPointerWithContext_t currentCalled;
-
-
-    /* Disallow copy constructor and assignment operators. */
-private:
-    CallChainOfFunctionPointersWithContext(
-        const CallChainOfFunctionPointersWithContext&
-    );
-    CallChainOfFunctionPointersWithContext &operator=(
-        const CallChainOfFunctionPointersWithContext&
-    );
 };
 
 /**

connectivity/FEATURE_BLE/include/ble/common/Duration.h

@@ -19,8 +19,8 @@
 #ifndef BLE_COMMON_DURATION_H_
 #define BLE_COMMON_DURATION_H_
 
-#include <stdint.h>
-#include <stddef.h>
+#include <cstdint>
+#include <cstddef>
 #include "platform/mbed_assert.h"
 #include "platform/mbed_chrono.h"
 
@@ -155,7 +155,7 @@ struct Duration {
      * @param other_ms The Duration in millisecond to convert.
      */
     template<typename OtherRep, typename OtherRange, typename OtherF>
-    explicit Duration(Duration<OtherRep, 1000, OtherRange, OtherF> other_ms, void* = NULL) :
+    explicit Duration(Duration<OtherRep, 1000, OtherRange, OtherF> other_ms, void* = nullptr) :
         duration(clamp(((other_ms.value() * 1000) + TB - 1) / TB))
     {
     }