Techwizz/xboxdrv
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Removed the remaining exit()'s from CommandLineOptions

Browse source
This commit is contained in:
Ingo Ruhnke 2009-06-19 01:29:21 +02:00
parent 112114d2b0
commit 6d48458009
3 changed files with 34 additions and 27 deletions

24
src/command_line_options.cpp
View file

@ -113,8 +113,7 @@ CommandLineOptions::parse_args(int argc, char** argv)
if (strcmp(argv[i], "-h") == 0 ||
strcmp(argv[i], "--help") == 0)
{
print_command_line_help(argc, argv);
exit(EXIT_SUCCESS);
opts.mode = PRINT_HELP;
}
else if (strcmp(argv[i], "-v") == 0 ||
strcmp(argv[i], "--verbose") == 0)
@ -124,8 +123,7 @@ CommandLineOptions::parse_args(int argc, char** argv)
else if (strcmp(argv[i], "-V") == 0 ||
strcmp(argv[i], "--version") == 0)
{
print_version();
exit(EXIT_SUCCESS);
opts.mode = PRINT_VERSION;
}
else if (strcmp(argv[i], "--quiet") == 0)
{
@ -345,8 +343,7 @@ CommandLineOptions::parse_args(int argc, char** argv)
{
if (strcmp(argv[i], "help") == 0)
{
print_led_help();
exit(EXIT_SUCCESS);
opts.mode = PRINT_LED_HELP;
}
else
{
@ -460,8 +457,7 @@ CommandLineOptions::parse_args(int argc, char** argv)
}
else if (strcmp("--help-led", argv[i]) == 0)
{
print_led_help();
exit(EXIT_SUCCESS);
opts.mode = PRINT_LED_HELP;
}
else if (strcmp(argv[i], "--device-by-id") == 0)
{
@ -514,17 +510,7 @@ CommandLineOptions::parse_args(int argc, char** argv)
}
else if (strcmp(argv[i], "--help-devices") == 0)
{
std::cout << " idVendor | idProduct | Name" << std::endl;
std::cout << "----------+-----------+---------------------------------" << std::endl;
for(int i = 0; i < xpad_devices_count; ++i)
{
std::cout << boost::format(" 0x%04x | 0x%04x | %s")
% int(xpad_devices[i].idVendor)
% int(xpad_devices[i].idProduct)
% xpad_devices[i].name
<< std::endl;
}
exit(EXIT_SUCCESS);
opts.mode = PRINT_HELP_DEVICES;
}
else
{

1
src/command_line_options.hpp
View file

@ -42,6 +42,7 @@ public:
RUN_LIST_SUPPORTED_DEVICES,
PRINT_VERSION,
PRINT_HELP,
PRINT_HELP_DEVICES,
PRINT_LED_HELP
} mode;

36
src/xboxdrv.cpp
View file

@ -635,24 +635,44 @@ Xboxdrv::main(int argc, char** argv)
switch(opts.mode)
{
case CommandLineOptions::PRINT_HELP_DEVICES:
{
std::cout << " idVendor | idProduct | Name" << std::endl;
std::cout << "----------+-----------+---------------------------------" << std::endl;
for(int i = 0; i < xpad_devices_count; ++i)
{
std::cout << boost::format(" 0x%04x | 0x%04x | %s")
% int(xpad_devices[i].idVendor)
% int(xpad_devices[i].idProduct)
% xpad_devices[i].name
<< std::endl;
}
}
break;
case CommandLineOptions::RUN_LIST_SUPPORTED_DEVICES:
for(int i = 0; i < xpad_devices_count; ++i)
{
std::cout << boost::format("%s 0x%04x 0x%04x %s\n")
% gamepadtype_to_string(xpad_devices[i].type)
% int(xpad_devices[i].idVendor)
% int(xpad_devices[i].idProduct)
% xpad_devices[i].name;
}
{
for(int i = 0; i < xpad_devices_count; ++i)
{
std::cout << boost::format("%s 0x%04x 0x%04x %s\n")
% gamepadtype_to_string(xpad_devices[i].type)
% int(xpad_devices[i].idVendor)
% int(xpad_devices[i].idProduct)
% xpad_devices[i].name;
}
}
break;
case CommandLineOptions::PRINT_VERSION:
opts.print_version();
break;
case CommandLineOptions::PRINT_HELP:
opts.print_command_line_help(argc, argv);
break;
case CommandLineOptions::PRINT_LED_HELP:
opts.print_led_help();
break;
case CommandLineOptions::RUN_DEFAULT: