Changeset 54347 in vbox

Timestamp:

Feb 20, 2015 10:43:16 PM (10 years ago)

Author:

vboxsync

Message:

Main/DHCPServerImpl: cosmetic - be consistent in using plural "aValues".

Location:

trunk/src/VBox/Main

Files:

• include/DHCPServerImpl.h (modified) (1 diff)
• src-server/DHCPServerImpl.cpp (modified) (3 diffs)

trunk/src/VBox/Main/include/DHCPServerImpl.h

@@ -110 +110 @@
     HRESULT getVmSlotOptions(const com::Utf8Str &aVmName,
                              LONG aSlot,
-                             std::vector<com::Utf8Str> &aValue);
+                             std::vector<com::Utf8Str> &aValues);
 
     // Wrapped IDHCPServer Methods

trunk/src/VBox/Main/src-server/DHCPServerImpl.cpp

@@ -286 +286 @@
 
 
-HRESULT DHCPServer::getGlobalOptions(std::vector<com::Utf8Str> &aValue)
-{
-    AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
-    aValue.resize(m->GlobalDhcpOptions.size());
+HRESULT DHCPServer::getGlobalOptions(std::vector<com::Utf8Str> &aValues)
+{
+    AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
+    aValues.resize(m->GlobalDhcpOptions.size());
     DhcpOptionMap::const_iterator it;
     size_t i = 0;
@@ -299 +299 @@
         // XXX: TODO: factor out and share with getVmSlotOptions()
         if (OptValue.encoding == DhcpOptValue::LEGACY)
-            aValue[i] = Utf8StrFmt("%d:%s", OptCode, OptValue.text.c_str());
+            aValues[i] = Utf8StrFmt("%d:%s", OptCode, OptValue.text.c_str());
     }
 
@@ -305 +305 @@
 }
 
-HRESULT DHCPServer::getVmConfigs(std::vector<com::Utf8Str> &aValue)
-{
-    AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
-    aValue.resize(m->VmSlot2Options.size());
+HRESULT DHCPServer::getVmConfigs(std::vector<com::Utf8Str> &aValues)
+{
+    AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
+    aValues.resize(m->VmSlot2Options.size());
     VmSlot2OptionsMap::const_iterator it;
     size_t i = 0;
     for (it = m->VmSlot2Options.begin(); it != m->VmSlot2Options.end(); ++it, ++i)
     {
-        aValue[i] = Utf8StrFmt("[%s]:%d", it->first.VmName.c_str(), it->first.Slot);
+        aValues[i] = Utf8StrFmt("[%s]:%d", it->first.VmName.c_str(), it->first.Slot);
     }