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

Merge pull request #3771 from mfleisz/code_cleanup

Browse Source 
core: Get rid of useless settings copy
This commit is contained in:
akallabeth 2017-02-15 15:55:30 +01:00 committed by GitHub
commit 570731919a
3 changed files with 0 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
libfreerdp/core/connection.c
View File

@ -178,17 +178,6 @@ BOOL rdp_client_connect(rdpRdp* rdp)
BOOL status;
rdpSettings* settings = rdp->settings;
if (rdp->settingsCopy)
{
freerdp_settings_free(rdp->settingsCopy);
rdp->settingsCopy = NULL;
}
rdp->settingsCopy = freerdp_settings_clone(settings);
if (!rdp->settingsCopy)
return FALSE;
nego_init(rdp->nego);
nego_set_target(rdp->nego, settings->ServerHostname, settings->ServerPort);
@ -313,12 +302,6 @@ BOOL rdp_client_disconnect(rdpRdp* rdp)
{
BOOL status;
if (rdp->settingsCopy)
{
freerdp_settings_free(rdp->settingsCopy);
rdp->settingsCopy = NULL;
}
status = nego_disconnect(rdp->nego);
rdp_reset(rdp);

1
libfreerdp/core/rdp.c
View File

@ -1694,7 +1694,6 @@ void rdp_free(rdpRdp* rdp)
winpr_Cipher_Free(rdp->fips_encrypt);
winpr_Cipher_Free(rdp->fips_decrypt);
freerdp_settings_free(rdp->settings);
freerdp_settings_free(rdp->settingsCopy);
transport_free(rdp->transport);
license_free(rdp->license);
input_free(rdp->input);

1
libfreerdp/core/rdp.h
View File

@ -175,7 +175,6 @@ struct rdp_rdp
BOOL resendFocus;
BOOL deactivation_reactivation;
BOOL AwaitCapabilities;
rdpSettings* settingsCopy;
};
FREERDP_LOCAL BOOL rdp_read_security_header(wStream* s, UINT16* flags);