CpuUid: fixed coding style

Author: MikeDK

drivers/CpuUid.cpp

@@ -26,18 +26,18 @@ const char CpuUid::_hexChars[16] = {'0', '1', '2', '3', '4', '5', '6', '7', '8',
 CpuUid::CpuUid() : _data(NULL)
 {
     _size = cpu_uid_get_length();
+#ifdef MBED_ASSERT
     MBED_ASSERT(_size > 0);
-    if (0 < _size)
-    {
+#endif
+    if (0 < _size) {
         _data = new uint8_t[_size];
         cpu_uid_get_uid(_data);
     }
 }
 
 CpuUid::~CpuUid()
 {
-    if (_data)
-    {
+    if (_data) {
         delete _data;
     }
 }
@@ -46,21 +46,19 @@ CpuUid::operator std::string()
 {
     std::string str;
 
-    for (int i = 0; i < _size; ++i)
-    {
+    for (int i = 0; i < _size; ++i) {
         str += _hexChars[_data[i] >> 4];
         str += _hexChars[_data[i] & 0x0F];
     }
 
     return str;
 }
 
-CpuUid::operator CpuUidArray()
+CpuUid::operator cpu_uid_array_t()
 {
-    CpuUidArray array;
+    cpu_uid_array_t array;
 
-    for (int i = 0; i < _size; ++i)
-    {
+    for (int i = 0; i < _size; ++i) {
         array.push_back(_data[i]);
     }
 
@@ -69,8 +67,7 @@ CpuUid::operator CpuUidArray()
 
 uint8_t CpuUid::operator[](int x)
 {
-    if (x >= 0 && x < _size)
-    {
+    if (x >= 0 && x < _size) {
         return _data[x];
     }
 

drivers/CpuUid.h

@@ -32,11 +32,10 @@ namespace mbed {
  * @ingroup drivers
  */
 class CpuUid {
-
 public:
     /** CPU UID array typedef
      */
-    typedef std::vector<uint8_t> CpuUidArray;
+    typedef std::vector<uint8_t> cpu_uid_array_t;
 
     /** CpuUid constructor
      */
@@ -50,31 +49,40 @@ class CpuUid {
      * 
      * @return Size of device's CPU UID in bytes
      */
-    int size() { return _size; }
+    int size()
+    {
+        return _size;
+    }
 
     /** Get CPU UID data pointer
      * 
      * @return Pointer to uid data buffer
      */
-    const uint8_t* data() { return _data; }
+    const uint8_t *data()
+    {
+        return _data;
+    }
 
     /** Overload operator for std::string
      * 
      * @return string object containing the CPU UID in uppercase hex letters in ascii format
      */
     operator std::string();
 
-    /** Overload operator for CpuUidArray
+    /** Overload operator for cpu_uid_array_t
      * 
-     * @return CpuUidArray object containing the CPU UID
+     * @return cpu_uid_array_t object containing the CPU UID
      */
-    operator CpuUidArray();
+    operator cpu_uid_array_t();
 
     /** Overload operator for byte pointer
      * 
      * @return Pointer to uid data buffer
      */
-    operator const uint8_t*() { return _data; }
+    operator const uint8_t*()
+    {
+        return _data;
+    }
 
     /** Overload operator for array subscript
      * 
@@ -85,7 +93,7 @@ class CpuUid {
     uint8_t operator[](int x);
 
 private:
-    uint8_t * _data;
+    uint8_t *_data;
     int _size;
 
     static const char _hexChars[16];