Merge branch 'master' of https://github.com/FreeRDP/FreeRDP into android_async
This commit is contained in:
commit
dfab92ada8
@ -21,6 +21,8 @@
|
|||||||
#include "config.h"
|
#include "config.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#include <assert.h>
|
||||||
|
|
||||||
#include <winpr/crt.h>
|
#include <winpr/crt.h>
|
||||||
#include <winpr/cmdline.h>
|
#include <winpr/cmdline.h>
|
||||||
|
|
||||||
@ -418,7 +420,7 @@ int freerdp_client_add_dynamic_channel(rdpSettings* settings, int count, char**
|
|||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
char** freerdp_command_line_parse_comma_separated_values(char* list, int* count)
|
static char** freerdp_command_line_parse_comma_separated_values(char* list, int* count)
|
||||||
{
|
{
|
||||||
char** p;
|
char** p;
|
||||||
char* str;
|
char* str;
|
||||||
@ -428,6 +430,9 @@ char** freerdp_command_line_parse_comma_separated_values(char* list, int* count)
|
|||||||
|
|
||||||
nArgs = nCommas = 0;
|
nArgs = nCommas = 0;
|
||||||
|
|
||||||
|
assert(NULL != count);
|
||||||
|
|
||||||
|
*count = 0;
|
||||||
if (!list)
|
if (!list)
|
||||||
return NULL;
|
return NULL;
|
||||||
|
|
||||||
@ -456,7 +461,7 @@ char** freerdp_command_line_parse_comma_separated_values(char* list, int* count)
|
|||||||
return p;
|
return p;
|
||||||
}
|
}
|
||||||
|
|
||||||
char** freerdp_command_line_parse_comma_separated_values_offset(char* list, int* count)
|
static char** freerdp_command_line_parse_comma_separated_values_offset(char* list, int* count)
|
||||||
{
|
{
|
||||||
char** p;
|
char** p;
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user