Manual style fixes, logic was not affected

libuavcan/include/uavcan/node/global_data_type_registry.hpp

@@ -56,14 +56,13 @@ public:
 
 private:
     typedef LinkedListRoot<Entry> List;
-    List msgs_;
-    List srvs_;
+    mutable List msgs_;
+    mutable List srvs_;
     bool frozen_;
 
     GlobalDataTypeRegistry() : frozen_(false) { }
 
-    const List* selectList(DataTypeKind kind) const;
-    List* selectList(DataTypeKind kind);
+    List* selectList(DataTypeKind kind) const;
 
     RegistResult remove(Entry* dtd);
     RegistResult registImpl(Entry* dtd);

libuavcan/src/data_type.cpp

@@ -55,9 +55,18 @@ std::string DataTypeDescriptor::toString() const
     char kindch = '?';
     switch (kind_)
     {
-    case DataTypeKindMessage: kindch = 'm'; break;
-    case DataTypeKindService: kindch = 's'; break;
-    default: assert(0);
+    case DataTypeKindMessage:
+    {
+        kindch = 'm';
+        break;
+    }
+    case DataTypeKindService:
+    {
+        kindch = 's';
+        break;
+    }
+    default:
+        assert(0);
     }
 
     std::ostringstream os;

libuavcan/src/driver/can.cpp

@@ -26,7 +26,8 @@ std::string CanFrame::toString(StringRepresentation mode) const
     static const int ASCII_COLUMN_OFFSET = 36;
 
     char buf[50];
-    char* wpos = buf, *epos = buf + sizeof(buf);
+    char* wpos = buf;
+    char* const epos = buf + sizeof(buf);
     std::fill(buf, buf + sizeof(buf), 0);
 
     if (id & FlagEFF)

libuavcan/src/marshal/bit_array_copy.cpp

@@ -7,16 +7,16 @@
 #include <cstring>
 #include <cstddef>
 
-#define PREPARE_FIRST_COPY()                                      \
-    do {                                                          \
-    if (src_len >= (CHAR_BIT - dst_offset_modulo)) {              \
-        *dst     &= reverse_mask[dst_offset_modulo];              \
-        src_len -= CHAR_BIT - dst_offset_modulo;                  \
-    } else {                                                      \
-        *dst     &= reverse_mask[dst_offset_modulo]               \
-              | reverse_mask_xor[dst_offset_modulo + src_len + 1];\
-         c       &= reverse_mask[dst_offset_modulo + src_len    ];\
-        src_len = 0;                                              \
+#define PREPARE_FIRST_COPY()                                       \
+    do {                                                           \
+    if (src_len >= (CHAR_BIT - dst_offset_modulo)) {               \
+        *dst &= reverse_mask[dst_offset_modulo];                   \
+        src_len -= CHAR_BIT - dst_offset_modulo;                   \
+    } else {                                                       \
+        *dst &= reverse_mask[dst_offset_modulo] |                  \
+                reverse_mask_xor[dst_offset_modulo + src_len + 1]; \
+         c &= reverse_mask[dst_offset_modulo + src_len];           \
+        src_len = 0;                                               \
     } } while (0)
 
 namespace uavcan

libuavcan/src/node/global_data_type_registry.cpp

@@ -10,25 +10,18 @@
 namespace uavcan
 {
 
-const GlobalDataTypeRegistry::List* GlobalDataTypeRegistry::selectList(DataTypeKind kind) const
+GlobalDataTypeRegistry::List* GlobalDataTypeRegistry::selectList(DataTypeKind kind) const
 {
-    switch (kind)
+    if (kind == DataTypeKindMessage)
     {
-    case DataTypeKindMessage: return &msgs_;
-    case DataTypeKindService: return &srvs_;
-    default:
-        assert(0);
-        return NULL;
+        return &msgs_;
     }
-}
-
-GlobalDataTypeRegistry::List* GlobalDataTypeRegistry::selectList(DataTypeKind kind)
-{
-    switch (kind)
+    else if (kind == DataTypeKindService)
+    {
+        return &srvs_;
+    }
+    else
     {
-    case DataTypeKindMessage: return &msgs_;
-    case DataTypeKindService: return &srvs_;
-    default:
         assert(0);
         return NULL;
     }

libuavcan/src/protocol/global_time_sync_master.cpp

@@ -104,8 +104,8 @@ int GlobalTimeSyncMaster::init()
     }
 
     // Data type ID
-    const DataTypeDescriptor* const desc = GlobalDataTypeRegistry::instance().find(DataTypeKindMessage,
-        protocol::GlobalTimeSync::getDataTypeFullName());
+    const DataTypeDescriptor* const desc =
+        GlobalDataTypeRegistry::instance().find(DataTypeKindMessage, protocol::GlobalTimeSync::getDataTypeFullName());
     if (desc == NULL)
     {
         return -1;

libuavcan/src/transport/frame.cpp

@@ -116,7 +116,8 @@ bool Frame::compile(CanFrame& out_can_frame) const
         return false;
     }
 
-    out_can_frame.id = CanFrame::FlagEFF |
+    out_can_frame.id =
+        CanFrame::FlagEFF |
         bitpack<0, 3>(transfer_id_.get()) |
         bitpack<3, 1>(last_frame_) |
         bitpack<4, 6>(frame_index_) |

libuavcan/src/transport/transfer_buffer.cpp

@@ -147,9 +147,11 @@ int DynamicTransferBufferManagerEntry::write(unsigned int offset, const uint8_t*
         len = max_size_ - offset;
     assert((offset + len) <= max_size_);
 
-    unsigned int total_offset = 0, left_to_write = len;
+    unsigned int total_offset = 0;
+    unsigned int left_to_write = len;
     const uint8_t* inptr = data;
-    Block* p = blocks_.get(), *last_written_block = NULL;
+    Block* p = blocks_.get();
+    Block* last_written_block = NULL;
 
     // First we need to write the part that is already allocated
     while (p)

libuavcan/src/transport/transfer_receiver.cpp

@@ -182,7 +182,8 @@ TransferReceiver::ResultCode TransferReceiver::addFrame(const RxFrame& frame, Tr
     const bool iface_timed_out =
         (frame.getMonotonicTimestamp() - this_transfer_ts_).toUSec() > (uint64_t(transfer_interval_usec_) * 2);
 
-    const bool need_restart = // FSM, the hard way
+    // FSM, the hard way
+    const bool need_restart =
         (not_initialized) ||
         (receiver_timed_out) ||
         (same_iface && first_fame && (tid_rel == TidFuture)) ||