Addin function pointers now expect const strings

diff --git a/channels/client/addin.c b/channels/client/addin.c
index 86b9f43..32cbb21 100644 (file)
--- a/channels/client/addin.c
+++ b/channels/client/addin.c
@@ -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;

diff --git a/include/freerdp/addin.h b/include/freerdp/addin.h
index d861d86..2fe1f58 100644 (file)
--- a/include/freerdp/addin.h
+++ b/include/freerdp/addin.h
@@ -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
 }

diff --git a/include/freerdp/client/channels.h b/include/freerdp/client/channels.h
index 336ba53..e298dce 100644 (file)
--- a/include/freerdp/client/channels.h
+++ b/include/freerdp/client/channels.h
@@ -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

diff --git a/libfreerdp/common/addin.c b/libfreerdp/common/addin.c
index 8179735..0c3ded4 100644 (file)
--- a/libfreerdp/common/addin.c
+++ b/libfreerdp/common/addin.c
@@ -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;