Changeset 49612 in vbox for trunk/src

Timestamp:

Nov 21, 2013 4:36:00 PM (11 years ago)

Author:

vboxsync

Message:

NATNetworkImpl.cpp: FindDHCPServerByNetworkName() returns HRESULT, but no int.
[-Wc++11-narrowing]

File:

• trunk/src/VBox/Main/src-server/NATNetworkImpl.cpp (modified) (4 diffs)

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

@@ -894 +894 @@
          * 6. start dhcp server.
          */
-        int rc = mVirtualBox->FindDHCPServerByNetworkName(mName.raw(),
+        HRESULT hrc = mVirtualBox->FindDHCPServerByNetworkName(mName.raw(),
                                                       m->dhcpServer.asOutParam());
-        switch (rc)
+        switch (hrc)
         {
             case E_INVALIDARG:
                 /* server haven't beeen found let create it then */
-                rc = mVirtualBox->CreateDHCPServer(mName.raw(),
+                hrc = mVirtualBox->CreateDHCPServer(mName.raw(),
                                                    m->dhcpServer.asOutParam());
-                if (FAILED(rc))
+                if (FAILED(hrc))
                   return E_FAIL;
                 /* breakthrough */
@@ -913 +913 @@
                          Utf8Str(m->IPv4DhcpServerUpperIp.raw()).c_str()));
 
-                rc = m->dhcpServer->COMSETTER(Enabled)(true);
+                hrc = m->dhcpServer->COMSETTER(Enabled)(true);
 
                 BSTR dhcpip = NULL;
@@ -924 +924 @@
                 m->IPv4DhcpServerLowerIp.cloneTo(&lowerip);
                 m->IPv4DhcpServerUpperIp.cloneTo(&upperip);
-                rc = m->dhcpServer->SetConfiguration(dhcpip,
+                hrc = m->dhcpServer->SetConfiguration(dhcpip,
                                                      netmask,
                                                      lowerip,
@@ -939 +939 @@
         m->dhcpServer->AddGlobalOption(DhcpOpt_Router, m->IPv4Gateway.raw());
 
-        rc = m->dhcpServer->Start(mName.raw(), Bstr("").raw(), aTrunkType);
-        if (FAILED(rc))
+        hrc = m->dhcpServer->Start(mName.raw(), Bstr("").raw(), aTrunkType);
+        if (FAILED(hrc))
         {
             m->dhcpServer.setNull();