VirtualBox

Changeset 1475 in vbox


Ignore:
Timestamp:
Mar 14, 2007 3:50:33 PM (18 years ago)
Author:
vboxsync
Message:

enums are 32-bit according to the C standard

Location:
trunk/src/VBox/Frontends/VBoxManage
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/VBox/Frontends/VBoxManage/VBoxInternalManage.cpp

    r1 r1475  
    5555 * Print the usage info.
    5656 */
    57 void printUsageInternal(USAGECATEGORY enmCmd)
     57void printUsageInternal(USAGECATEGORY u64Cmd)
    5858{
    5959    RTPrintf("Usage: VBoxManage internalcommands <command> [command arguments]\n"
     
    6565             "         problems. It is completely unsupported and will change in\n"
    6666             "         incompatible ways without warning.\n",
    67             (enmCmd & USAGE_LOADSYMS) ?
     67            (u64Cmd & USAGE_LOADSYMS) ?
    6868                "  loadsyms <vmname>|<uuid> <symfile> [delta] [module] [module address]\n"
    6969                "      This will instruct DBGF to load the given symbolfile\n"
     
    7171                "\n"
    7272                : "",
    73             (enmCmd & USAGE_UNLOADSYMS) ?
     73            (u64Cmd & USAGE_UNLOADSYMS) ?
    7474                "  unloadsyms <vmname>|<uuid> <symfile>\n"
    7575                "      Removes <symfile> from the list of symbol files that\n"
     
    7777                "\n"
    7878                : "",
    79             (enmCmd & USAGE_SETVDIUUID) ?
     79            (u64Cmd & USAGE_SETVDIUUID) ?
    8080                "  setvdiuuid <filepath>\n"
    8181                "       Assigns a new UUID to the given VDI file. This way, multiple copies\n"
  • trunk/src/VBox/Frontends/VBoxManage/VBoxManage.cpp

    r1473 r1475  
    211211///////////////////////////////////////////////////////////////////////////////
    212212
    213 static void printUsage(USAGECATEGORY enmCmd)
     213static void printUsage(USAGECATEGORY u64Cmd)
    214214{
    215215#ifdef __LINUX__
     
    229229#endif
    230230
    231     if (enmCmd == USAGE_DUMPOPTS)
     231    if (u64Cmd == USAGE_DUMPOPTS)
    232232    {
    233233        fLinux = true;
    234234        fWin = true;
    235235        fVRDP = true;
    236         enmCmd = USAGE_ALL;
     236        u64Cmd = USAGE_ALL;
    237237    }
    238238
     
    240240             "\n");
    241241
    242     if (enmCmd & USAGE_LIST)
     242    if (u64Cmd & USAGE_LIST)
    243243    {
    244244        RTPrintf("VBoxManage list             vms|ostypes|hostdvds|hostfloppies|");
     
    251251    }
    252252
    253     if (enmCmd & USAGE_SHOWVMINFO)
     253    if (u64Cmd & USAGE_SHOWVMINFO)
    254254    {
    255255        RTPrintf("VBoxManage showvminfo       <uuid>|<name>\n"
     
    258258    }
    259259
    260     if (enmCmd & USAGE_REGISTERVM)
     260    if (u64Cmd & USAGE_REGISTERVM)
    261261    {
    262262        RTPrintf("VBoxManage registervm       <filename>\n"
     
    264264    }
    265265
    266     if (enmCmd & USAGE_UNREGISTERVM)
     266    if (u64Cmd & USAGE_UNREGISTERVM)
    267267    {
    268268        RTPrintf("VBoxManage unregistervm     <uuid>|<name>\n"
     
    271271    }
    272272
    273     if (enmCmd & USAGE_CREATEVM)
     273    if (u64Cmd & USAGE_CREATEVM)
    274274    {
    275275        RTPrintf("VBoxManage createvm         -name <name>\n"
     
    280280    }
    281281
    282     if (enmCmd & USAGE_MODIFYVM)
     282    if (u64Cmd & USAGE_MODIFYVM)
    283283    {
    284284        RTPrintf("VBoxManage modifyvm         <uuid|name>\n"
     
    342342    }
    343343
    344     if (enmCmd & USAGE_STARTVM)
     344    if (u64Cmd & USAGE_STARTVM)
    345345    {
    346346        RTPrintf("VBoxManage startvm          <uuid>|<name>\n"
     
    349349    }
    350350
    351     if (enmCmd & USAGE_CONTROLVM)
     351    if (u64Cmd & USAGE_CONTROLVM)
    352352    {
    353353        RTPrintf("VBoxManage controlvm        <uuid>|<name>\n"
     
    365365    }
    366366
    367     if (enmCmd & USAGE_DISCARDSTATE)
     367    if (u64Cmd & USAGE_DISCARDSTATE)
    368368    {
    369369        RTPrintf("VBoxManage discardstate     <uuid>|<name>\n"
     
    371371    }
    372372
    373     if (enmCmd & USAGE_SNAPSHOT)
     373    if (u64Cmd & USAGE_SNAPSHOT)
    374374    {
    375375        RTPrintf("VBoxManage snapshot         <uuid>|<name>\n"
     
    384384    }
    385385
    386     if (enmCmd & USAGE_REGISTERIMAGE)
     386    if (u64Cmd & USAGE_REGISTERIMAGE)
    387387    {
    388388        RTPrintf("VBoxManage registerimage    disk|dvd|floppy <filename>\n"
     
    391391    }
    392392
    393     if (enmCmd & USAGE_UNREGISTERIMAGE)
     393    if (u64Cmd & USAGE_UNREGISTERIMAGE)
    394394    {
    395395        RTPrintf("VBoxManage unregisterimage  disk|dvd|floppy <uuid>|<filename>\n"
     
    397397    }
    398398
    399     if (enmCmd & USAGE_SHOWVDIINFO)
     399    if (u64Cmd & USAGE_SHOWVDIINFO)
    400400    {
    401401        RTPrintf("VBoxManage showvdiinfo      <uuid>|<filename>\n"
     
    403403    }
    404404
    405     if (enmCmd & USAGE_CREATEVDI)
     405    if (u64Cmd & USAGE_CREATEVDI)
    406406    {
    407407        RTPrintf("VBoxManage createvdi        -filename <filename>\n"
     
    414414    }
    415415
    416     if (enmCmd & USAGE_MODIFYVDI)
     416    if (u64Cmd & USAGE_MODIFYVDI)
    417417    {
    418418        RTPrintf("VBoxManage modifyvdi        <uuid>|<filename>\n"
     
    424424    }
    425425
    426     if (enmCmd & USAGE_CLONEVDI)
     426    if (u64Cmd & USAGE_CLONEVDI)
    427427    {
    428428        RTPrintf("VBoxManage clonevdi         <uuid>|<filename> <outputfile>\n"
     
    430430    }
    431431
    432     if (enmCmd & USAGE_CONVERTDD)
     432    if (u64Cmd & USAGE_CONVERTDD)
    433433    {
    434434        RTPrintf("VBoxManage convertdd        <filename> <outputfile>\n"
     
    436436    }
    437437
    438     if (enmCmd & USAGE_ADDISCSIDISK)
     438    if (u64Cmd & USAGE_ADDISCSIDISK)
    439439    {
    440440        RTPrintf("VBoxManage addiscsidisk     -server <name>|<ip>\n"
     
    449449    }
    450450
    451     if (enmCmd & USAGE_CREATEHOSTIF && fWin)
     451    if (u64Cmd & USAGE_CREATEHOSTIF && fWin)
    452452    {
    453453        RTPrintf("VBoxManage createhostif     <name>\n"
     
    455455    }
    456456
    457     if (enmCmd & USAGE_REMOVEHOSTIF && fWin)
     457    if (u64Cmd & USAGE_REMOVEHOSTIF && fWin)
    458458    {
    459459        RTPrintf("VBoxManage removehostif     <uuid>|<name>\n"
     
    461461    }
    462462
    463     if (enmCmd & USAGE_GETEXTRADATA)
     463    if (u64Cmd & USAGE_GETEXTRADATA)
    464464    {
    465465        RTPrintf("VBoxManage getextradata     global|<uuid>|<name>\n"
     
    468468    }
    469469
    470     if (enmCmd & USAGE_SETEXTRADATA)
     470    if (u64Cmd & USAGE_SETEXTRADATA)
    471471    {
    472472        RTPrintf("VBoxManage setextradata     global|<uuid>|<name>\n"
     
    476476    }
    477477
    478     if (enmCmd & USAGE_SETPROPERTY)
     478    if (u64Cmd & USAGE_SETPROPERTY)
    479479    {
    480480        RTPrintf("VBoxManage setproperty      vdifolder default|<folder> |\n"
     
    485485    }
    486486
    487     if (enmCmd & USAGE_USBFILTER_ADD)
     487    if (u64Cmd & USAGE_USBFILTER_ADD)
    488488    {
    489489        RTPrintf("VBoxManage usbfilter        add <index,0-N>\n"
     
    502502    }
    503503
    504     if (enmCmd & USAGE_USBFILTER_MODIFY)
     504    if (u64Cmd & USAGE_USBFILTER_MODIFY)
    505505    {
    506506        RTPrintf("VBoxManage usbfilter        modify <index,0-N>\n"
     
    519519    }
    520520
    521     if (enmCmd & USAGE_USBFILTER_REMOVE)
     521    if (u64Cmd & USAGE_USBFILTER_REMOVE)
    522522    {
    523523        RTPrintf("VBoxManage usbfilter        remove <index,0-N>\n"
     
    526526    }
    527527
    528     if (enmCmd & USAGE_SHAREDFOLDER_ADD)
     528    if (u64Cmd & USAGE_SHAREDFOLDER_ADD)
    529529    {
    530530        RTPrintf("VBoxManage sharedfolder     add <vmname>|<uuid>\n"
     
    534534    }
    535535
    536     if (enmCmd & USAGE_SHAREDFOLDER_REMOVE)
     536    if (u64Cmd & USAGE_SHAREDFOLDER_REMOVE)
    537537    {
    538538        RTPrintf("VBoxManage sharedfolder     remove <vmname>|<uuid>\n"
     
    541541    }
    542542
    543     if (enmCmd & USAGE_UPDATESETTINGS)
     543    if (u64Cmd & USAGE_UPDATESETTINGS)
    544544    {
    545545        RTPrintf("VBoxManage updatesettings   [<dir>|<file>] [-apply]\n"
     
    552552 * Print a usage synopsis and the syntax error message.
    553553 */
    554 int errorSyntax(USAGECATEGORY enmCmd, const char *pszFormat, ...)
     554int errorSyntax(USAGECATEGORY u64Cmd, const char *pszFormat, ...)
    555555{
    556556    va_list args;
    557557    if (fInternalMode)
    558         printUsageInternal(enmCmd);
     558        printUsageInternal(u64Cmd);
    559559    else
    560         printUsage(enmCmd);
     560        printUsage(u64Cmd);
    561561    va_start(args, pszFormat);
    562562    RTPrintf("\n"
  • trunk/src/VBox/Frontends/VBoxManage/VBoxManage.h

    r1428 r1475  
    2525
    2626/** Syntax diagram category. */
    27 typedef enum {
    28     USAGE_DUMPOPTS              = 0,
    29     USAGE_LIST                  = BIT64(0),
    30     USAGE_SHOWVMINFO            = BIT64(1),
    31     USAGE_REGISTERVM            = BIT64(2),
    32     USAGE_UNREGISTERVM          = BIT64(3),
    33     USAGE_CREATEVM              = BIT64(4),
    34     USAGE_MODIFYVM              = BIT64(5),
    35     USAGE_STARTVM               = BIT64(6),
    36     USAGE_CONTROLVM             = BIT64(7),
    37     USAGE_DISCARDSTATE          = BIT64(8),
    38     USAGE_SNAPSHOT              = BIT64(9),
    39     USAGE_REGISTERIMAGE         = BIT64(10),
    40     USAGE_UNREGISTERIMAGE       = BIT64(11),
    41     USAGE_SHOWVDIINFO           = BIT64(12),
    42     USAGE_CREATEVDI             = BIT64(13),
    43     USAGE_MODIFYVDI             = BIT64(14),
    44     USAGE_CLONEVDI              = BIT64(15),
    45     USAGE_ADDISCSIDISK          = BIT64(16),
    46     USAGE_CREATEHOSTIF          = BIT64(17),
    47     USAGE_REMOVEHOSTIF          = BIT64(18),
    48     USAGE_GETEXTRADATA          = BIT64(19),
    49     USAGE_SETEXTRADATA          = BIT64(20),
    50     USAGE_SETPROPERTY           = BIT64(21),
    51     USAGE_USBFILTER             = BIT64(22) | BIT64(23) | BIT64(24),
    52     USAGE_USBFILTER_ADD         = BIT64(22),
    53     USAGE_USBFILTER_MODIFY      = BIT64(23),
    54     USAGE_USBFILTER_REMOVE      = BIT64(24),
    55     USAGE_SHAREDFOLDER          = BIT64(25) | BIT64(26),
    56     USAGE_SHAREDFOLDER_ADD      = BIT64(25),
    57     USAGE_SHAREDFOLDER_REMOVE   = BIT64(26),
    58     USAGE_UPDATESETTINGS        = BIT64(27),
    59     USAGE_LOADSYMS              = BIT64(29),
    60     USAGE_UNLOADSYMS            = BIT64(30),
    61     USAGE_SETVDIUUID            = BIT64(31),
    62     USAGE_CONVERTDD             = BIT64(32),
    63     USAGE_ALL                   = (uint64_t)~0,
    64 } USAGECATEGORY;
     27#define USAGE_DUMPOPTS              0
     28#define USAGE_LIST                  BIT64(0)
     29#define USAGE_SHOWVMINFO            BIT64(1)
     30#define USAGE_REGISTERVM            BIT64(2)
     31#define USAGE_UNREGISTERVM          BIT64(3)
     32#define USAGE_CREATEVM              BIT64(4)
     33#define USAGE_MODIFYVM              BIT64(5)
     34#define USAGE_STARTVM               BIT64(6)
     35#define USAGE_CONTROLVM             BIT64(7)
     36#define USAGE_DISCARDSTATE          BIT64(8)
     37#define USAGE_SNAPSHOT              BIT64(9)
     38#define USAGE_REGISTERIMAGE         BIT64(10)
     39#define USAGE_UNREGISTERIMAGE       BIT64(11)
     40#define USAGE_SHOWVDIINFO           BIT64(12)
     41#define USAGE_CREATEVDI             BIT64(13)
     42#define USAGE_MODIFYVDI             BIT64(14)
     43#define USAGE_CLONEVDI              BIT64(15)
     44#define USAGE_ADDISCSIDISK          BIT64(16)
     45#define USAGE_CREATEHOSTIF          BIT64(17)
     46#define USAGE_REMOVEHOSTIF          BIT64(18)
     47#define USAGE_GETEXTRADATA          BIT64(19)
     48#define USAGE_SETEXTRADATA          BIT64(20)
     49#define USAGE_SETPROPERTY           BIT64(21)
     50#define USAGE_USBFILTER             BIT64(22) | BIT64(23) | BIT64(24)
     51#define USAGE_USBFILTER_ADD         BIT64(22)
     52#define USAGE_USBFILTER_MODIFY      BIT64(23)
     53#define USAGE_USBFILTER_REMOVE      BIT64(24)
     54#define USAGE_SHAREDFOLDER          BIT64(25) | BIT64(26)
     55#define USAGE_SHAREDFOLDER_ADD      BIT64(25)
     56#define USAGE_SHAREDFOLDER_REMOVE   BIT64(26)
     57#define USAGE_UPDATESETTINGS        BIT64(27)
     58#define USAGE_LOADSYMS              BIT64(29)
     59#define USAGE_UNLOADSYMS            BIT64(30)
     60#define USAGE_SETVDIUUID            BIT64(31)
     61#define USAGE_CONVERTDD             BIT64(32)
     62#define USAGE_ALL                   (uint64_t)~0
     63
     64typedef uint64_t USAGECATEGORY;
    6565
    6666/** flag whether we're in internal mode */
     
    7070 * Prototypes
    7171 */
    72 int errorSyntax(USAGECATEGORY enmCmd, const char *pszFormat, ...);
     72int errorSyntax(USAGECATEGORY u64Cmd, const char *pszFormat, ...);
    7373int errorArgument(const char *pszFormat, ...);
    7474
    75 void printUsageInternal(USAGECATEGORY enmCmd);
     75void printUsageInternal(USAGECATEGORY u64Cmd);
    7676int handleInternalCommands(int argc, char *argv[],
    7777                           ComPtr <IVirtualBox> aVirtualBox, ComPtr<ISession> aSession);
Note: See TracChangeset for help on using the changeset viewer.

© 2024 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy