mirrors/FreeRDP
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

libfreerdp-client: cleanup old syntax detection

Browse Source
This commit is contained in:
Marc-André Moreau 2012-12-02 14:18:36 -05:00
parent e6f524f6c3
commit 4747effa9d
5 changed files with 2 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
client/DirectFB/dfreerdp.c
View File

@ -462,13 +462,6 @@ int main(int argc, char* argv[])
instance->context->argc = argc; instance->context->argc = argc;
instance->context->argv = argv; instance->context->argv = argv;
if (freerdp_detect_posix_style_command_line_syntax(instance->context->argc,instance->context->argv))
{
printf("warning: deprecated command-line syntax detected!\n");
freerdp_client_print_command_line_help(argc, argv);
exit(0);
}
status = freerdp_client_parse_command_line_arguments(argc, argv, instance->settings); status = freerdp_client_parse_command_line_arguments(argc, argv, instance->settings);
if (status < 0) if (status < 0)

7
client/Sample/freerdp.c
View File

@ -320,13 +320,6 @@ int main(int argc, char* argv[])
channels = instance->context->channels; channels = instance->context->channels;
if (freerdp_detect_posix_style_command_line_syntax(instance->context->argc, instance->context->argv))
{
printf("warning: deprecated command-line syntax detected!\n");
freerdp_client_print_command_line_help(argc, argv);
exit(0);
}
status = freerdp_client_parse_command_line_arguments(argc, argv, instance->settings); status = freerdp_client_parse_command_line_arguments(argc, argv, instance->settings);
if (status < 0) if (status < 0)

11
client/Windows/wfreerdp.c
View File

@ -771,16 +771,9 @@ INT WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine
freerdp_register_addin_provider(freerdp_channels_load_static_addin_entry, 0); freerdp_register_addin_provider(freerdp_channels_load_static_addin_entry, 0);
if (freerdp_detect_windows_style_command_line_syntax(__argc, __argv)) status = freerdp_client_parse_command_line_arguments(__argc, __argv, instance->settings);
{
status = freerdp_client_parse_command_line_arguments(__argc, __argv, instance->settings);
freerdp_client_load_addins(instance->context->channels, instance->settings); freerdp_client_load_addins(instance->context->channels, instance->settings);
}
else
{
freerdp_client_print_command_line_help(__argc, __argv);
}
if (status < 0) if (status < 0)
{ {

2
client/common/cmdline.c
View File

@ -652,8 +652,6 @@ int freerdp_client_parse_command_line_arguments(int argc, char** argv, rdpSettin
status = CommandLineParseArgumentsA(argc, (const char**) argv, args, flags, settings, status = CommandLineParseArgumentsA(argc, (const char**) argv, args, flags, settings,
freerdp_client_command_line_pre_filter, freerdp_client_command_line_post_filter); freerdp_client_command_line_pre_filter, freerdp_client_command_line_post_filter);
printf("status: %d\n", status);
if (status == COMMAND_LINE_STATUS_PRINT_HELP) if (status == COMMAND_LINE_STATUS_PRINT_HELP)
{ {
freerdp_client_print_command_line_help(argc, argv); freerdp_client_print_command_line_help(argc, argv);

3
include/freerdp/client/cmdline.h
View File

@ -23,9 +23,6 @@
#include <freerdp/api.h> #include <freerdp/api.h>
#include <freerdp/freerdp.h> #include <freerdp/freerdp.h>
FREERDP_API BOOL freerdp_detect_windows_style_command_line_syntax(int argc, char** argv);
FREERDP_API BOOL freerdp_detect_posix_style_command_line_syntax(int argc, char** argv);
FREERDP_API int freerdp_client_parse_command_line_arguments(int argc, char** argv, rdpSettings* settings); FREERDP_API int freerdp_client_parse_command_line_arguments(int argc, char** argv, rdpSettings* settings);
FREERDP_API int freerdp_client_load_addins(rdpChannels* channels, rdpSettings* settings); FREERDP_API int freerdp_client_load_addins(rdpChannels* channels, rdpSettings* settings);
FREERDP_API int freerdp_client_print_command_line_help(int argc, char** argv); FREERDP_API int freerdp_client_print_command_line_help(int argc, char** argv);