Changeset 54696 in vbox for trunk/src/VBox

Timestamp:

Mar 9, 2015 1:03:59 PM (10 years ago)

Author:

vboxsync

Message:

NetworkServices: fixed a few warnings

Location:

trunk/src/VBox/NetworkServices

Files:

• DHCP/Config.cpp (modified) (2 diffs)
• NetLib/ComHostUtils.cpp (modified) (1 diff)
• NetLib/utils.h (modified) (1 diff)

trunk/src/VBox/NetworkServices/DHCP/Config.cpp

@@ -219 +219 @@
     xml::NodesLoop leases(*root);
 
-    bool valueExists;
     const xml::ElementNode *lease;
     while ((lease = leases.forAllNodes()))
@@ -1406 +1405 @@
 bool Lease::toXML(xml::ElementNode *node) const
 {
-    bool valueAddition = node->setAttribute(tagXMLLeaseAttributeMac.c_str(), com::Utf8StrFmt("%RTmac", &m->m_mac));
-    if (!valueAddition) return false;
-
-    valueAddition = node->setAttribute(tagXMLLeaseAttributeNetwork.c_str(), com::Utf8StrFmt("%RTnaipv4", m->m_network));
-    if (!valueAddition) return false;
-
-    xml::ElementNode *address = node->createChild(tagXMLLeaseAddress.c_str());
-    if (!address) return false;
-
-    valueAddition = address->setAttribute(tagXMLAddressAttributeValue.c_str(), com::Utf8StrFmt("%RTnaipv4", m->m_address));
-    if (!valueAddition) return false;
-
-    xml::ElementNode *time = node->createChild(tagXMLLeaseTime.c_str());
-    if (!time) return false;
-
-    valueAddition = time->setAttribute(tagXMLTimeAttributeIssued.c_str(),
-                                       m->u64TimestampLeasingStarted);
-    if (!valueAddition) return false;
-
-    valueAddition = time->setAttribute(tagXMLTimeAttributeExpiration.c_str(),
-                                       m->u32LeaseExpirationPeriod);
-    if (!valueAddition) return false;
+    xml::AttributeNode *pAttribNode = node->setAttribute(tagXMLLeaseAttributeMac.c_str(),
+                                                         com::Utf8StrFmt("%RTmac", &m->m_mac));
+    if (!pAttribNode)
+        return false;
+
+    pAttribNode = node->setAttribute(tagXMLLeaseAttributeNetwork.c_str(),
+                                     com::Utf8StrFmt("%RTnaipv4", m->m_network));
+    if (!pAttribNode)
+        return false;
+
+    xml::ElementNode *pLeaseAddress = node->createChild(tagXMLLeaseAddress.c_str());
+    if (!pLeaseAddress)
+        return false;
+
+    pAttribNode = pLeaseAddress->setAttribute(tagXMLAddressAttributeValue.c_str(),
+                                              com::Utf8StrFmt("%RTnaipv4", m->m_address));
+    if (!pAttribNode)
+        return false;
+
+    xml::ElementNode *pLeaseTime = node->createChild(tagXMLLeaseTime.c_str());
+    if (!pLeaseTime)
+        return false;
+
+    pAttribNode = pLeaseTime->setAttribute(tagXMLTimeAttributeIssued.c_str(),
+                                           m->u64TimestampLeasingStarted);
+    if (!pAttribNode)
+        return false;
+
+    pAttribNode = pLeaseTime->setAttribute(tagXMLTimeAttributeExpiration.c_str(),
+                                           m->u32LeaseExpirationPeriod);
+    if (!pAttribNode)
+        return false;
 
     return true;

trunk/src/VBox/NetworkServices/NetLib/ComHostUtils.cpp

@@ -79 +79 @@
 
     ComBstrArray strs;
-    int cStrs;
+    size_t cStrs;
     HRESULT hrc = nat->COMGETTER(LocalMappings)(ComSafeArrayAsOutParam(strs));
     if (   SUCCEEDED(hrc)
         && (cStrs = strs.size()))
     {
-        for (int i = 0; i < cStrs; ++i)
+        for (size_t i = 0; i < cStrs; ++i)
         {
             char szAddr[17];

trunk/src/VBox/NetworkServices/NetLib/utils.h

@@ -40 +40 @@
         return false;
 
-    return fNeedDhcpServer;
+    return RT_BOOL(fNeedDhcpServer);
 }