Clément Bertolini / BLE_API

Important changes to repositories hosted on mbed.com

Mbed hosted mercurial repositories are deprecated and are due to be permanently deleted in July 2026.

To keep a copy of this software download the repository Zip archive or clone locally using Mercurial.

It is also possible to export all your personal repositories from the account settings page.

Fork of BLE_API by Bluetooth Low Energy

Diff: UUID.cpp

Revision:
50:9078969e80e4
Parent:
43:ac154ac74a30
Child:
53:a1bec483c8e3
--- a/UUID.cpp	Fri May 23 17:45:16 2014 +0100
+++ b/UUID.cpp	Wed May 28 15:25:55 2014 +0100
@@ -28,11 +28,11 @@
             function before it can be safely used!
 */
 /**************************************************************************/
-UUID::UUID(void)
+UUID::UUID(void) : type(UUID_TYPE_SHORT),
+                   base(),
+                   value(0)
 {
-    memset(base, 0, 16);
-    value = 0;
-    type  = UUID_TYPE_SHORT;
+    /* empty */
 }
 
 /**************************************************************************/
@@ -79,9 +79,12 @@
     @endcode
 */
 /**************************************************************************/
-UUID::UUID(uint8_t const uuid_base[16])
+UUID::UUID(const uint8_t uuid_base[LENGTH_OF_LONG_UUID]) :
+                                        type(UUID_TYPE_SHORT),
+                                        base(),
+                                        value(0)
 {
-    memcpy(base, uuid_base, 16);
+    memcpy(base, uuid_base, LENGTH_OF_LONG_UUID);
     value = (uint16_t)((uuid_base[3] << 8) | (uuid_base[2]));
 
     /* Check if this is a short of a long UUID */
@@ -103,12 +106,11 @@
                 The 16-bit BLE UUID value.
 */
 /**************************************************************************/
-UUID::UUID(uint16_t const ble_uuid)
+UUID::UUID(const uint16_t ble_uuid) : type(UUID_TYPE_SHORT),
+                                      base(),
+                                      value(ble_uuid)
 {
-    memset(base, 0, 16);
     memcpy(base + 2, (uint8_t *)&ble_uuid, 2);
-    value = ble_uuid;
-    type  = UUID_TYPE_SHORT;
 }
 
 /**************************************************************************/
@@ -140,9 +142,9 @@
     @endcode
 */
 /**************************************************************************/
-ble_error_t UUID::update(uint8_t const uuid_base[16])
+ble_error_t UUID::update(uint8_t const uuid_base[LENGTH_OF_LONG_UUID])
 {
-    memcpy(base, uuid_base, 16);
+    memcpy(base, uuid_base, LENGTH_OF_LONG_UUID);
     value = (uint16_t)((uuid_base[3] << 8) | (uuid_base[2]));
 
     /* Check if this is a short of a long UUID */
@@ -179,7 +181,7 @@
 /**************************************************************************/
 ble_error_t UUID::update(uint16_t const ble_uuid)
 {
-    memset(base, 0, 16);
+    memset(base, 0, LENGTH_OF_LONG_UUID);
     memcpy(base + 2, (uint8_t *)&ble_uuid, 2);
     value = ble_uuid;
     type  = UUID_TYPE_SHORT;