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

Addin function pointers now expect const strings

Browse Source
This commit is contained in:
Armin Novak 2019-02-07 14:23:14 +01:00
parent f51a9bafcc
commit 52b03cd408
4 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
channels/client/addin.c
View File

@ -84,8 +84,8 @@ void* freerdp_channels_client_find_static_entry(const char* name, const char* id
extern const STATIC_ADDIN_TABLE CLIENT_STATIC_ADDIN_TABLE[];
FREERDP_ADDIN** freerdp_channels_list_client_static_addins(LPSTR pszName, LPSTR pszSubsystem,
LPSTR pszType, DWORD dwFlags)
static FREERDP_ADDIN** freerdp_channels_list_client_static_addins(LPCSTR pszName, LPCSTR pszSubsystem,
LPCSTR pszType, DWORD dwFlags)
{
size_t i, j;
DWORD nAddins;
@ -145,8 +145,8 @@ error_out:
return NULL;
}
FREERDP_ADDIN** freerdp_channels_list_dynamic_addins(LPSTR pszName, LPSTR pszSubsystem,
LPSTR pszType, DWORD dwFlags)
static FREERDP_ADDIN** freerdp_channels_list_dynamic_addins(LPCSTR pszName, LPCSTR pszSubsystem,
LPCSTR pszType, DWORD dwFlags)
{
int index;
int nDashes;
@ -303,7 +303,7 @@ error_out:
return NULL;
}
FREERDP_ADDIN** freerdp_channels_list_addins(LPSTR pszName, LPSTR pszSubsystem, LPSTR pszType,
FREERDP_ADDIN** freerdp_channels_list_addins(LPCSTR pszName, LPCSTR pszSubsystem, LPCSTR pszType,
DWORD dwFlags)
{
if (dwFlags & FREERDP_ADDIN_STATIC)
@ -345,8 +345,8 @@ BOOL freerdp_channels_is_virtual_channel_entry_ex(LPCSTR pszName)
return FALSE;
}
PVIRTUALCHANNELENTRY freerdp_channels_load_static_addin_entry(LPCSTR pszName, LPSTR pszSubsystem,
LPSTR pszType, DWORD dwFlags)
PVIRTUALCHANNELENTRY freerdp_channels_load_static_addin_entry(LPCSTR pszName, LPCSTR pszSubsystem,
LPCSTR pszType, DWORD dwFlags)
{
int i, j;
STATIC_SUBSYSTEM_ENTRY* subsystems;

6
include/freerdp/addin.h
View File

@ -48,7 +48,7 @@ struct _FREERDP_ADDIN
typedef struct _FREERDP_ADDIN FREERDP_ADDIN;
typedef PVIRTUALCHANNELENTRY(*FREERDP_LOAD_CHANNEL_ADDIN_ENTRY_FN)(
LPCSTR pszName, LPSTR pszSubsystem, LPSTR pszType, DWORD dwFlags);
LPCSTR pszName, LPCSTR pszSubsystem, LPCSTR pszType, DWORD dwFlags);
#ifdef __cplusplus
extern "C" {
@ -63,9 +63,9 @@ FREERDP_API int freerdp_register_addin_provider(
FREERDP_API PVIRTUALCHANNELENTRY freerdp_load_dynamic_addin(LPCSTR pszFileName,
LPCSTR pszPath, LPCSTR pszEntryName);
FREERDP_API PVIRTUALCHANNELENTRY freerdp_load_dynamic_channel_addin_entry(
LPCSTR pszName, LPSTR pszSubsystem, LPSTR pszType, DWORD dwFlags);
LPCSTR pszName, LPCSTR pszSubsystem, LPCSTR pszType, DWORD dwFlags);
FREERDP_API PVIRTUALCHANNELENTRY freerdp_load_channel_addin_entry(
LPCSTR pszName, LPSTR pszSubsystem, LPSTR pszType, DWORD dwFlags);
LPCSTR pszName, LPCSTR pszSubsystem, LPCSTR pszType, DWORD dwFlags);
#ifdef __cplusplus
}

4
include/freerdp/client/channels.h
View File

@ -29,9 +29,9 @@ extern "C" {
#endif
FREERDP_API void* freerdp_channels_client_find_static_entry(const char* name, const char* identifier);
FREERDP_API PVIRTUALCHANNELENTRY freerdp_channels_load_static_addin_entry(LPCSTR pszName, LPSTR pszSubsystem, LPSTR pszType, DWORD dwFlags);
FREERDP_API PVIRTUALCHANNELENTRY freerdp_channels_load_static_addin_entry(LPCSTR pszName, LPCSTR pszSubsystem, LPCSTR pszType, DWORD dwFlags);
FREERDP_API FREERDP_ADDIN** freerdp_channels_list_addins(LPSTR lpName, LPSTR lpSubsystem, LPSTR lpType, DWORD dwFlags);
FREERDP_API FREERDP_ADDIN** freerdp_channels_list_addins(LPCSTR lpName, LPCSTR lpSubsystem, LPCSTR lpType, DWORD dwFlags);
FREERDP_API void freerdp_channels_addin_list_free(FREERDP_ADDIN** ppAddins);
#ifdef __cplusplus

4
libfreerdp/common/addin.c
View File

@ -234,7 +234,7 @@ fail:
}
PVIRTUALCHANNELENTRY freerdp_load_dynamic_channel_addin_entry(LPCSTR pszName,
LPSTR pszSubsystem, LPSTR pszType, DWORD dwFlags)
LPCSTR pszSubsystem, LPCSTR pszType, DWORD dwFlags)
{
PVIRTUALCHANNELENTRY entry;
LPSTR pszFileName;
@ -336,7 +336,7 @@ int freerdp_register_addin_provider(FREERDP_LOAD_CHANNEL_ADDIN_ENTRY_FN
}
PVIRTUALCHANNELENTRY freerdp_load_channel_addin_entry(LPCSTR pszName,
LPSTR pszSubsystem, LPSTR pszType, DWORD dwFlags)
LPCSTR pszSubsystem, LPCSTR pszType, DWORD dwFlags)
{
PVIRTUALCHANNELENTRY entry = NULL;