libfreerdp-client: cleanup old syntax detection

diff --git a/client/DirectFB/dfreerdp.c b/client/DirectFB/dfreerdp.c
index c6faba6..1812cd3 100644 (file)
--- a/client/DirectFB/dfreerdp.c
+++ b/client/DirectFB/dfreerdp.c
@@ -462,13 +462,6 @@ int main(int argc, char* argv[])
        instance->context->argc = argc;
        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);
 
        if (status < 0)

diff --git a/client/Sample/freerdp.c b/client/Sample/freerdp.c
index 2fb93f7..11155c2 100644 (file)
--- a/client/Sample/freerdp.c
+++ b/client/Sample/freerdp.c
@@ -320,13 +320,6 @@ int main(int argc, char* argv[])
 
        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);
 
        if (status < 0)

diff --git a/client/Windows/wfreerdp.c b/client/Windows/wfreerdp.c
index 667346a..47867de 100644 (file)
--- a/client/Windows/wfreerdp.c
+++ b/client/Windows/wfreerdp.c
@@ -771,16 +771,9 @@ INT WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine
 
                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);
-               }
-               else
-               {
-                       freerdp_client_print_command_line_help(__argc, __argv);
-               }
+               freerdp_client_load_addins(instance->context->channels, instance->settings);
 
                if (status < 0)
                {

diff --git a/client/common/cmdline.c b/client/common/cmdline.c
index c780f46..c6d8b33 100644 (file)
--- a/client/common/cmdline.c
+++ b/client/common/cmdline.c
@@ -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,
                        freerdp_client_command_line_pre_filter, freerdp_client_command_line_post_filter);
 
-       printf("status: %d\n", status);
-
        if (status == COMMAND_LINE_STATUS_PRINT_HELP)
        {
                freerdp_client_print_command_line_help(argc, argv);

diff --git a/include/freerdp/client/cmdline.h b/include/freerdp/client/cmdline.h
index 3cff3f0..141bc0f 100644 (file)
--- a/include/freerdp/client/cmdline.h
+++ b/include/freerdp/client/cmdline.h
@@ -23,9 +23,6 @@
 #include <freerdp/api.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_load_addins(rdpChannels* channels, rdpSettings* settings);
 FREERDP_API int freerdp_client_print_command_line_help(int argc, char** argv);