Merge pull request #589 from peternewman/libusb

Fix some more defects and some minor tidying
OpenLightingProject · Jan 3, 2015 · 6421881 · 6421881
2 parents 2ec510a + 9b96cc2
commit 6421881
Show file tree

Hide file tree

Showing 25 changed files with 227 additions and 126 deletions.
diff --git a/common/base/LoggingTest.cpp b/common/base/LoggingTest.cpp
@@ -70,7 +70,7 @@ void MockLogDestination::AddExpected(log_level level, string log_line) {
  */
 void MockLogDestination::Write(log_level level, const string &log_line) {
   vector<string> tokens;
-  ola::StringSplit(log_line, tokens, ":");
+  ola::StringSplit(log_line, &tokens, ":");
   vector<string>::iterator iter;
   OLA_ASSERT_EQ(tokens.size() , (size_t) 3);
   OLA_ASSERT_GT(m_log_lines.size(), 0);

diff --git a/common/network/IPV4Address.cpp b/common/network/IPV4Address.cpp
@@ -67,7 +67,7 @@ bool IPV4StringToAddress(const string &address, struct in_addr *addr) {
 // TODO(Peter): This currently allows some rather quirky values as per
 // inet_aton, we may want to restrict that in future to match IPV4Validator
 
-  if (address.length() == 0) {
+  if (address.empty()) {
     // Don't bother trying to extract an address if we weren't given one
     return false;
   }
@@ -98,16 +98,18 @@ string IPV4Address::ToString() const {
 
 IPV4Address* IPV4Address::FromString(const string &address) {
   struct in_addr addr;
-  if (!IPV4StringToAddress(address, &addr))
+  if (!IPV4StringToAddress(address, &addr)) {
     return NULL;
+  }
 
   return new IPV4Address(addr.s_addr);
 }
 
 bool IPV4Address::FromString(const string &address, IPV4Address *target) {
   struct in_addr addr;
-  if (!IPV4StringToAddress(address, &addr))
+  if (!IPV4StringToAddress(address, &addr)) {
     return false;
+  }
   *target = IPV4Address(addr.s_addr);
   return true;
 }

diff --git a/common/network/MACAddress.cpp b/common/network/MACAddress.cpp
@@ -144,31 +144,35 @@ bool StringToEther(const string &address, ether_addr *target) {
    * handle dots as well as colons as seperators)
    */
   vector<string> tokens;
-  ola::StringSplit(address, tokens, ":.");
-  if (tokens.size() != MACAddress::LENGTH)
+  ola::StringSplit(address, &tokens, ":.");
+  if (tokens.size() != MACAddress::LENGTH) {
     return false;
+  }
 
   for (unsigned int i = 0; i < MACAddress::LENGTH; i++) {
-    if (!ola::HexStringToInt(tokens[i], target->ether_addr_octet + i))
+    if (!ola::HexStringToInt(tokens[i], target->ether_addr_octet + i)) {
       return false;
+    }
   }
   return true;
 }
 
 
 MACAddress* MACAddress::FromString(const string &address) {
   struct ether_addr addr;
-  if (!StringToEther(address, &addr))
+  if (!StringToEther(address, &addr)) {
     return NULL;
+  }
 
   return new MACAddress(addr.ether_addr_octet);
 }
 
 bool MACAddress::FromString(const string &address, MACAddress *target) {
   struct ether_addr addr;
 
-  if (!StringToEther(address, &addr))
+  if (!StringToEther(address, &addr)) {
     return false;
+  }
 
   *target = MACAddress(addr.ether_addr_octet);
   return true;

diff --git a/common/rdm/UID.cpp b/common/rdm/UID.cpp
@@ -31,17 +31,20 @@ using std::vector;
 
 UID* UID::FromString(const string &uid) {
   vector<string> tokens;
-  ola::StringSplit(uid, tokens, ":");
+  ola::StringSplit(uid, &tokens, ":");
 
-  if (tokens.size() != 2 || tokens[0].size() != 4 || tokens[1].size() != 8)
+  if (tokens.size() != 2 || tokens[0].size() != 4 || tokens[1].size() != 8) {
     return NULL;
+  }
 
   uint16_t esta_id;
   unsigned int device_id;
-  if (!ola::HexStringToInt(tokens[0], &esta_id))
+  if (!ola::HexStringToInt(tokens[0], &esta_id)) {
     return NULL;
-  if (!ola::HexStringToInt(tokens[1], &device_id))
+  }
+  if (!ola::HexStringToInt(tokens[1], &device_id)) {
     return NULL;
+  }
 
   return new UID(esta_id, device_id);
 }

diff --git a/common/utils/DmxBuffer.cpp b/common/utils/DmxBuffer.cpp
@@ -175,7 +175,7 @@ bool DmxBuffer::SetFromString(const string &input) {
     m_length = 0;
     return true;
   }
-  StringSplit(input, dmx_values, ",");
+  StringSplit(input, &dmx_values, ",");
   for (iter = dmx_values.begin();
       iter != dmx_values.end() && i < DMX_UNIVERSE_SIZE; ++iter, ++i) {
     m_data[i] = atoi(iter->data());