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

common:: Fix const issues with current rdp file API

Browse Source
This commit is contained in:
Martin Fleisz 2023-03-08 13:29:15 +01:00 committed by akallabeth
parent 9a51f3b77b
commit 093bf79837
2 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
client/common/file.c
View File

@ -212,7 +212,8 @@ struct rdp_file
}; };
static SSIZE_T freerdp_client_rdp_file_add_line(rdpFile* file); static SSIZE_T freerdp_client_rdp_file_add_line(rdpFile* file);
static rdpFileLine* freerdp_client_rdp_file_find_line_by_name(rdpFile* file, const char* name); static rdpFileLine* freerdp_client_rdp_file_find_line_by_name(const rdpFile* file,
const char* name);
static void freerdp_client_file_string_check_free(LPSTR str); static void freerdp_client_file_string_check_free(LPSTR str);
static BOOL freerdp_client_rdp_file_find_integer_entry(rdpFile* file, const char* name, static BOOL freerdp_client_rdp_file_find_integer_entry(rdpFile* file, const char* name,
@ -1460,7 +1461,7 @@ fail:
freerdp_addin_argv_free(args); freerdp_addin_argv_free(args);
return NULL; return NULL;
} }
BOOL freerdp_client_populate_settings_from_rdp_file(rdpFile* file, rdpSettings* settings) BOOL freerdp_client_populate_settings_from_rdp_file(const rdpFile* file, rdpSettings* settings)
{ {
BOOL setDefaultConnectionType = TRUE; BOOL setDefaultConnectionType = TRUE;
@ -2244,7 +2245,7 @@ BOOL freerdp_client_populate_settings_from_rdp_file(rdpFile* file, rdpSettings*
return TRUE; return TRUE;
} }
static rdpFileLine* freerdp_client_rdp_file_find_line_by_name(rdpFile* file, const char* name) static rdpFileLine* freerdp_client_rdp_file_find_line_by_name(const rdpFile* file, const char* name)
{ {
size_t index; size_t index;
BOOL bFound = FALSE; BOOL bFound = FALSE;
@ -2278,12 +2279,12 @@ int freerdp_client_rdp_file_set_string_option(rdpFile* file, const char* name, c
return freerdp_client_rdp_file_set_string(file, name, value); return freerdp_client_rdp_file_set_string(file, name, value);
} }
const char* freerdp_client_rdp_file_get_string_option(rdpFile* file, const char* name) const char* freerdp_client_rdp_file_get_string_option(const rdpFile* file, const char* name)
{ {
LPSTR* value = NULL; LPSTR* value = NULL;
rdpFileLine* line = NULL; rdpFileLine* line = NULL;
if (freerdp_client_rdp_file_find_string_entry(file, name, &value, &line)) if (freerdp_client_rdp_file_find_string_entry((rdpFile*)file, name, &value, &line))
{ {
if (value) if (value)
return *value; return *value;
@ -2299,12 +2300,12 @@ int freerdp_client_rdp_file_set_integer_option(rdpFile* file, const char* name,
return freerdp_client_rdp_file_set_integer(file, name, value); return freerdp_client_rdp_file_set_integer(file, name, value);
} }
int freerdp_client_rdp_file_get_integer_option(rdpFile* file, const char* name) int freerdp_client_rdp_file_get_integer_option(const rdpFile* file, const char* name)
{ {
DWORD* value = NULL; DWORD* value = NULL;
rdpFileLine* line = NULL; rdpFileLine* line = NULL;
if (freerdp_client_rdp_file_find_integer_entry(file, name, &value, &line)) if (freerdp_client_rdp_file_find_integer_entry((rdpFile*)file, name, &value, &line))
{ {
if (value) if (value)
return *value; return *value;

7
include/freerdp/client/file.h
View File

@ -45,7 +45,7 @@ extern "C"
size_t size); size_t size);
FREERDP_API BOOL freerdp_client_parse_rdp_file_buffer_ex(rdpFile* file, const BYTE* buffer, FREERDP_API BOOL freerdp_client_parse_rdp_file_buffer_ex(rdpFile* file, const BYTE* buffer,
size_t size, rdp_file_fkt_parse parse); size_t size, rdp_file_fkt_parse parse);
FREERDP_API BOOL freerdp_client_populate_settings_from_rdp_file(rdpFile* file, FREERDP_API BOOL freerdp_client_populate_settings_from_rdp_file(const rdpFile* file,
rdpSettings* settings); rdpSettings* settings);
FREERDP_API BOOL freerdp_client_populate_rdp_file_from_settings(rdpFile* file, FREERDP_API BOOL freerdp_client_populate_rdp_file_from_settings(rdpFile* file,
@ -57,12 +57,13 @@ extern "C"
FREERDP_API int freerdp_client_rdp_file_set_string_option(rdpFile* file, const char* name, FREERDP_API int freerdp_client_rdp_file_set_string_option(rdpFile* file, const char* name,
const char* value); const char* value);
FREERDP_API const char* freerdp_client_rdp_file_get_string_option(rdpFile* file, FREERDP_API const char* freerdp_client_rdp_file_get_string_option(const rdpFile* file,
const char* name); const char* name);
FREERDP_API int freerdp_client_rdp_file_set_integer_option(rdpFile* file, const char* name, FREERDP_API int freerdp_client_rdp_file_set_integer_option(rdpFile* file, const char* name,
int value); int value);
FREERDP_API int freerdp_client_rdp_file_get_integer_option(rdpFile* file, const char* name); FREERDP_API int freerdp_client_rdp_file_get_integer_option(const rdpFile* file,
const char* name);
FREERDP_API rdpFile* freerdp_client_rdp_file_new(void); FREERDP_API rdpFile* freerdp_client_rdp_file_new(void);
FREERDP_API rdpFile* freerdp_client_rdp_file_new_ex(DWORD flags); FREERDP_API rdpFile* freerdp_client_rdp_file_new_ex(DWORD flags);