- Timestamp:
- Jul 25, 2014 12:50:28 PM (11 years ago)
- svn:sync-xref-src-repo-rev:
- 95240
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/VBox/Frontends/VBoxManage/VBoxManageModifyVM.cpp
r51476 r52185 416 416 } 417 417 418 int parseScreens(const char *pcszScreens, com::SafeArray<BOOL> *pScreens)418 static int parseScreens(const char *pcszScreens, com::SafeArray<BOOL> *pScreens) 419 419 { 420 420 while (pcszScreens && *pcszScreens) … … 437 437 pcszScreens = pszNext; 438 438 } 439 return 0; 440 } 441 442 static int parseNum(uint32_t uIndex, unsigned cMaxIndex, const char *pszName) 443 { 444 if ( uIndex >= 1 445 && uIndex <= cMaxIndex) 446 return uIndex; 447 errorArgument("Invalid %s number %u", pszName, uIndex); 439 448 return 0; 440 449 } … … 1217 1226 case MODIFYVM_NICTRACEFILE: 1218 1227 { 1228 1229 if (!parseNum(GetOptState.uIndex, NetworkAdapterCount, "NIC")) 1230 break; 1231 1219 1232 ComPtr<INetworkAdapter> nic; 1220 1221 1233 CHECK_ERROR_BREAK(machine, GetNetworkAdapter(GetOptState.uIndex - 1, nic.asOutParam())); 1222 1234 ASSERT(nic); … … 1228 1240 case MODIFYVM_NICTRACE: 1229 1241 { 1242 if (!parseNum(GetOptState.uIndex, NetworkAdapterCount, "NIC")) 1243 break; 1244 1230 1245 ComPtr<INetworkAdapter> nic; 1231 1232 1246 CHECK_ERROR_BREAK(machine, GetNetworkAdapter(GetOptState.uIndex - 1, nic.asOutParam())); 1233 1247 ASSERT(nic); … … 1239 1253 case MODIFYVM_NICPROPERTY: 1240 1254 { 1255 if (!parseNum(GetOptState.uIndex, NetworkAdapterCount, "NIC")) 1256 break; 1257 1241 1258 ComPtr<INetworkAdapter> nic; 1242 1243 1259 CHECK_ERROR_BREAK(machine, GetNetworkAdapter(GetOptState.uIndex - 1, nic.asOutParam())); 1244 1260 ASSERT(nic); … … 1276 1292 case MODIFYVM_NICTYPE: 1277 1293 { 1294 if (!parseNum(GetOptState.uIndex, NetworkAdapterCount, "NIC")) 1295 break; 1296 1278 1297 ComPtr<INetworkAdapter> nic; 1279 1280 1298 CHECK_ERROR_BREAK(machine, GetNetworkAdapter(GetOptState.uIndex - 1, nic.asOutParam())); 1281 1299 ASSERT(nic); … … 1319 1337 case MODIFYVM_NICSPEED: 1320 1338 { 1339 if (!parseNum(GetOptState.uIndex, NetworkAdapterCount, "NIC")) 1340 break; 1341 1321 1342 ComPtr<INetworkAdapter> nic; 1322 1323 1343 CHECK_ERROR_BREAK(machine, GetNetworkAdapter(GetOptState.uIndex - 1, nic.asOutParam())); 1324 1344 ASSERT(nic); … … 1330 1350 case MODIFYVM_NICBOOTPRIO: 1331 1351 { 1352 if (!parseNum(GetOptState.uIndex, NetworkAdapterCount, "NIC")) 1353 break; 1354 1332 1355 ComPtr<INetworkAdapter> nic; 1333 1334 1356 CHECK_ERROR_BREAK(machine, GetNetworkAdapter(GetOptState.uIndex - 1, nic.asOutParam())); 1335 1357 ASSERT(nic); … … 1368 1390 } 1369 1391 1392 if (!parseNum(GetOptState.uIndex, NetworkAdapterCount, "NIC")) 1393 break; 1394 1370 1395 ComPtr<INetworkAdapter> nic; 1371 1396 CHECK_ERROR_BREAK(machine, GetNetworkAdapter(GetOptState.uIndex - 1, nic.asOutParam())); … … 1378 1403 case MODIFYVM_NICBWGROUP: 1379 1404 { 1405 if (!parseNum(GetOptState.uIndex, NetworkAdapterCount, "NIC")) 1406 break; 1407 1380 1408 ComPtr<INetworkAdapter> nic; 1381 1409 CHECK_ERROR_BREAK(machine, GetNetworkAdapter(GetOptState.uIndex - 1, nic.asOutParam())); … … 1408 1436 case MODIFYVM_NIC: 1409 1437 { 1438 if (!parseNum(GetOptState.uIndex, NetworkAdapterCount, "NIC")) 1439 break; 1440 1410 1441 ComPtr<INetworkAdapter> nic; 1411 1412 1442 CHECK_ERROR_BREAK(machine, GetNetworkAdapter(GetOptState.uIndex - 1, nic.asOutParam())); 1413 1443 ASSERT(nic); … … 1466 1496 case MODIFYVM_CABLECONNECTED: 1467 1497 { 1498 if (!parseNum(GetOptState.uIndex, NetworkAdapterCount, "NIC")) 1499 break; 1500 1468 1501 ComPtr<INetworkAdapter> nic; 1469 1470 1502 CHECK_ERROR_BREAK(machine, GetNetworkAdapter(GetOptState.uIndex - 1, nic.asOutParam())); 1471 1503 ASSERT(nic); … … 1477 1509 case MODIFYVM_BRIDGEADAPTER: 1478 1510 { 1511 if (!parseNum(GetOptState.uIndex, NetworkAdapterCount, "NIC")) 1512 break; 1513 1479 1514 ComPtr<INetworkAdapter> nic; 1480 1481 1515 CHECK_ERROR_BREAK(machine, GetNetworkAdapter(GetOptState.uIndex - 1, nic.asOutParam())); 1482 1516 ASSERT(nic); … … 1496 1530 case MODIFYVM_HOSTONLYADAPTER: 1497 1531 { 1532 if (!parseNum(GetOptState.uIndex, NetworkAdapterCount, "NIC")) 1533 break; 1534 1498 1535 ComPtr<INetworkAdapter> nic; 1499 1500 1536 CHECK_ERROR_BREAK(machine, GetNetworkAdapter(GetOptState.uIndex - 1, nic.asOutParam())); 1501 1537 ASSERT(nic); … … 1515 1551 case MODIFYVM_INTNET: 1516 1552 { 1553 if (!parseNum(GetOptState.uIndex, NetworkAdapterCount, "NIC")) 1554 break; 1555 1517 1556 ComPtr<INetworkAdapter> nic; 1518 1519 1557 CHECK_ERROR_BREAK(machine, GetNetworkAdapter(GetOptState.uIndex - 1, nic.asOutParam())); 1520 1558 ASSERT(nic); … … 1534 1572 case MODIFYVM_GENERICDRV: 1535 1573 { 1574 if (!parseNum(GetOptState.uIndex, NetworkAdapterCount, "NIC")) 1575 break; 1576 1536 1577 ComPtr<INetworkAdapter> nic; 1537 1538 1578 CHECK_ERROR_BREAK(machine, GetNetworkAdapter(GetOptState.uIndex - 1, nic.asOutParam())); 1539 1579 ASSERT(nic); … … 1545 1585 case MODIFYVM_NATNETWORKNAME: 1546 1586 { 1587 if (!parseNum(GetOptState.uIndex, NetworkAdapterCount, "NIC")) 1588 break; 1589 1547 1590 ComPtr<INetworkAdapter> nic; 1548 1549 1591 CHECK_ERROR_BREAK(machine, GetNetworkAdapter(GetOptState.uIndex - 1, nic.asOutParam())); 1550 1592 ASSERT(nic); … … 1556 1598 case MODIFYVM_NATNET: 1557 1599 { 1600 if (!parseNum(GetOptState.uIndex, NetworkAdapterCount, "NIC")) 1601 break; 1602 1558 1603 ComPtr<INetworkAdapter> nic; 1559 ComPtr<INATEngine> engine;1560 1561 1604 CHECK_ERROR_BREAK(machine, GetNetworkAdapter(GetOptState.uIndex - 1, nic.asOutParam())); 1562 1605 ASSERT(nic); 1563 1606 1607 ComPtr<INATEngine> engine; 1564 1608 CHECK_ERROR(nic, COMGETTER(NATEngine)(engine.asOutParam())); 1565 1609 … … 1574 1618 case MODIFYVM_NATBINDIP: 1575 1619 { 1620 if (!parseNum(GetOptState.uIndex, NetworkAdapterCount, "NIC")) 1621 break; 1622 1576 1623 ComPtr<INetworkAdapter> nic; 1577 ComPtr<INATEngine> engine;1578 1579 1624 CHECK_ERROR_BREAK(machine, GetNetworkAdapter(GetOptState.uIndex - 1, nic.asOutParam())); 1580 1625 ASSERT(nic); 1581 1626 1627 ComPtr<INATEngine> engine; 1582 1628 CHECK_ERROR(nic, COMGETTER(NATEngine)(engine.asOutParam())); 1629 1583 1630 CHECK_ERROR(engine, COMSETTER(HostIP)(Bstr(ValueUnion.psz).raw())); 1584 1631 break; … … 1622 1669 strTcpRcv = RTStrStrip(ch); 1623 1670 1671 if (!parseNum(GetOptState.uIndex, NetworkAdapterCount, "NIC")) 1672 break; 1673 1624 1674 CHECK_ERROR_BREAK(machine, GetNetworkAdapter(GetOptState.uIndex - 1, nic.asOutParam())); 1625 1675 ASSERT(nic); … … 1634 1684 case MODIFYVM_NATPF: 1635 1685 { 1686 if (!parseNum(GetOptState.uIndex, NetworkAdapterCount, "NIC")) 1687 break; 1688 1636 1689 ComPtr<INetworkAdapter> nic; 1637 ComPtr<INATEngine> engine;1638 1639 1690 CHECK_ERROR_BREAK(machine, GetNetworkAdapter(GetOptState.uIndex - 1, nic.asOutParam())); 1640 1691 ASSERT(nic); 1641 1692 1693 ComPtr<INATEngine> engine; 1642 1694 CHECK_ERROR(nic, COMGETTER(NATEngine)(engine.asOutParam())); 1695 1643 1696 /* format name:proto:hostip:hostport:guestip:guestport*/ 1644 1697 if (RTStrCmp(ValueUnion.psz, "delete") != 0) … … 1727 1780 case MODIFYVM_NATTFTPPREFIX: 1728 1781 { 1782 if (!parseNum(GetOptState.uIndex, NetworkAdapterCount, "NIC")) 1783 break; 1784 1729 1785 ComPtr<INetworkAdapter> nic; 1730 ComPtr<INATEngine> engine;1731 1732 1786 CHECK_ERROR_BREAK(machine, GetNetworkAdapter(GetOptState.uIndex - 1, nic.asOutParam())); 1733 1787 ASSERT(nic); 1734 1788 1789 ComPtr<INATEngine> engine; 1735 1790 CHECK_ERROR(nic, COMGETTER(NATEngine)(engine.asOutParam())); 1791 1736 1792 CHECK_ERROR(engine, COMSETTER(TFTPPrefix)(Bstr(ValueUnion.psz).raw())); 1737 1793 break; … … 1740 1796 case MODIFYVM_NATTFTPFILE: 1741 1797 { 1798 if (!parseNum(GetOptState.uIndex, NetworkAdapterCount, "NIC")) 1799 break; 1800 1742 1801 ComPtr<INetworkAdapter> nic; 1743 ComPtr<INATEngine> engine;1744 1745 1802 CHECK_ERROR_BREAK(machine, GetNetworkAdapter(GetOptState.uIndex - 1, nic.asOutParam())); 1746 1803 ASSERT(nic); 1747 1804 1805 ComPtr<INATEngine> engine; 1748 1806 CHECK_ERROR(nic, COMGETTER(NATEngine)(engine.asOutParam())); 1807 1749 1808 CHECK_ERROR(engine, COMSETTER(TFTPBootFile)(Bstr(ValueUnion.psz).raw())); 1750 1809 break; … … 1753 1812 case MODIFYVM_NATTFTPSERVER: 1754 1813 { 1814 if (!parseNum(GetOptState.uIndex, NetworkAdapterCount, "NIC")) 1815 break; 1816 1755 1817 ComPtr<INetworkAdapter> nic; 1756 ComPtr<INATEngine> engine;1757 1758 1818 CHECK_ERROR_BREAK(machine, GetNetworkAdapter(GetOptState.uIndex - 1, nic.asOutParam())); 1759 1819 ASSERT(nic); 1760 1820 1821 ComPtr<INATEngine> engine; 1761 1822 CHECK_ERROR(nic, COMGETTER(NATEngine)(engine.asOutParam())); 1823 1762 1824 CHECK_ERROR(engine, COMSETTER(TFTPNextServer)(Bstr(ValueUnion.psz).raw())); 1763 1825 break; … … 1765 1827 case MODIFYVM_NATDNSPASSDOMAIN: 1766 1828 { 1829 if (!parseNum(GetOptState.uIndex, NetworkAdapterCount, "NIC")) 1830 break; 1831 1767 1832 ComPtr<INetworkAdapter> nic; 1768 ComPtr<INATEngine> engine;1769 1770 1833 CHECK_ERROR_BREAK(machine, GetNetworkAdapter(GetOptState.uIndex - 1, nic.asOutParam())); 1771 1834 ASSERT(nic); 1772 1835 1836 ComPtr<INATEngine> engine; 1773 1837 CHECK_ERROR(nic, COMGETTER(NATEngine)(engine.asOutParam())); 1838 1774 1839 CHECK_ERROR(engine, COMSETTER(DNSPassDomain)(ValueUnion.f)); 1775 1840 break; … … 1778 1843 case MODIFYVM_NATDNSPROXY: 1779 1844 { 1845 if (!parseNum(GetOptState.uIndex, NetworkAdapterCount, "NIC")) 1846 break; 1847 1780 1848 ComPtr<INetworkAdapter> nic; 1781 ComPtr<INATEngine> engine;1782 1783 1849 CHECK_ERROR_BREAK(machine, GetNetworkAdapter(GetOptState.uIndex - 1, nic.asOutParam())); 1784 1850 ASSERT(nic); 1785 1851 1852 ComPtr<INATEngine> engine; 1786 1853 CHECK_ERROR(nic, COMGETTER(NATEngine)(engine.asOutParam())); 1854 1787 1855 CHECK_ERROR(engine, COMSETTER(DNSProxy)(ValueUnion.f)); 1788 1856 break; … … 1791 1859 case MODIFYVM_NATDNSHOSTRESOLVER: 1792 1860 { 1861 if (!parseNum(GetOptState.uIndex, NetworkAdapterCount, "NIC")) 1862 break; 1863 1793 1864 ComPtr<INetworkAdapter> nic; 1794 ComPtr<INATEngine> engine;1795 1796 1865 CHECK_ERROR_BREAK(machine, GetNetworkAdapter(GetOptState.uIndex - 1, nic.asOutParam())); 1797 1866 ASSERT(nic); 1798 1867 1868 ComPtr<INATEngine> engine; 1799 1869 CHECK_ERROR(nic, COMGETTER(NATEngine)(engine.asOutParam())); 1870 1800 1871 CHECK_ERROR(engine, COMSETTER(DNSUseHostResolver)(ValueUnion.f)); 1801 1872 break; … … 1803 1874 case MODIFYVM_MACADDRESS: 1804 1875 { 1876 if (!parseNum(GetOptState.uIndex, NetworkAdapterCount, "NIC")) 1877 break; 1878 1805 1879 ComPtr<INetworkAdapter> nic; 1806 1807 1880 CHECK_ERROR_BREAK(machine, GetNetworkAdapter(GetOptState.uIndex - 1, nic.asOutParam())); 1808 1881 ASSERT(nic);
Note:
See TracChangeset
for help on using the changeset viewer.