morgan/FreeRDP
1
0
Fork 0
mirror of https://github.com/morgan9e/FreeRDP synced 2026-04-14 00:14:11 +09:00
Code Issues Packages Projects Releases Wiki Activity

[core] fix const correctness

Browse Source 
Make function arguments const if possible.
This commit is contained in:
akallabeth
2025-09-26 10:54:46 +02:00
parent 8377048057
commit 1baa721961
11 changed files with 53 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
include/freerdp/freerdp.h
View File

@@ -608,7 +608,7 @@ owned by rdpRdp */
#if !defined(WITHOUT_FREERDP_3x_DEPRECATED)
WINPR_DEPRECATED_VAR("use freerdp_shall_disconnect_context instead",
FREERDP_API BOOL freerdp_shall_disconnect(freerdp* instance));
FREERDP_API BOOL freerdp_shall_disconnect(const freerdp* instance));
#endif
FREERDP_API BOOL freerdp_shall_disconnect_context(const rdpContext* context);
@@ -653,10 +653,10 @@ owned by rdpRdp */
wMessage* message);
FREERDP_API int freerdp_message_queue_process_pending_messages(freerdp* instance, DWORD id);
FREERDP_API UINT32 freerdp_error_info(freerdp* instance);
FREERDP_API UINT32 freerdp_error_info(const freerdp* instance);
FREERDP_API void freerdp_set_error_info(rdpRdp* rdp, UINT32 error);
FREERDP_API BOOL freerdp_send_error_info(rdpRdp* rdp);
FREERDP_API BOOL freerdp_get_stats(rdpRdp* rdp, UINT64* inBytes, UINT64* outBytes,
FREERDP_API BOOL freerdp_get_stats(const rdpRdp* rdp, UINT64* inBytes, UINT64* outBytes,
UINT64* inPackets, UINT64* outPackets);
FREERDP_API void freerdp_get_version(int* major, int* minor, int* revision);
@@ -672,9 +672,9 @@ owned by rdpRdp */
FREERDP_API BOOL freerdp_focus_required(freerdp* instance);
FREERDP_API void freerdp_set_focus(freerdp* instance);
FREERDP_API int freerdp_get_disconnect_ultimatum(rdpContext* context);
FREERDP_API int freerdp_get_disconnect_ultimatum(const rdpContext* context);
FREERDP_API UINT32 freerdp_get_last_error(rdpContext* context);
FREERDP_API UINT32 freerdp_get_last_error(const rdpContext* context);
FREERDP_API const char* freerdp_get_last_error_name(UINT32 error);
FREERDP_API const char* freerdp_get_last_error_string(UINT32 error);
FREERDP_API const char* freerdp_get_last_error_category(UINT32 error);
@@ -702,12 +702,12 @@ owned by rdpRdp */
FREERDP_API const char* freerdp_get_logon_error_info_data_ex(UINT32 data, char* buffer,
size_t size);
FREERDP_API ULONG freerdp_get_transport_sent(rdpContext* context, BOOL resetCount);
FREERDP_API ULONG freerdp_get_transport_sent(const rdpContext* context, BOOL resetCount);
FREERDP_API BOOL freerdp_nla_impersonate(rdpContext* context);
FREERDP_API BOOL freerdp_nla_revert_to_self(rdpContext* context);
FREERDP_API UINT32 freerdp_get_nla_sspi_error(rdpContext* context);
FREERDP_API UINT32 freerdp_get_nla_sspi_error(const rdpContext* context);
/** Encrypts the provided buffer using the NLA's GSSAPI context
*
@@ -745,12 +745,13 @@ owned by rdpRdp */
FREERDP_API void clearChannelError(rdpContext* context);
FREERDP_API HANDLE getChannelErrorEventHandle(rdpContext* context);
FREERDP_API UINT getChannelError(rdpContext* context);
FREERDP_API const char* getChannelErrorDescription(rdpContext* context);
FREERDP_API UINT getChannelError(const rdpContext* context);
FREERDP_API const char* getChannelErrorDescription(const rdpContext* context);
FREERDP_API void setChannelError(rdpContext* context, UINT errorNum, const char* format, ...);
FREERDP_API BOOL checkChannelErrorEvent(rdpContext* context);
FREERDP_API const char* freerdp_nego_get_routing_token(rdpContext* context, DWORD* length);
FREERDP_API const char* freerdp_nego_get_routing_token(const rdpContext* context,
DWORD* length);
/** \brief returns the current \b CONNECTION_STATE of the context.
*
@@ -815,7 +816,7 @@ owned by rdpRdp */
* @return The current function pointer set or \b NULL
* @since version 3.16.0
*/
FREERDP_API pGetCommonAccessToken freerdp_get_common_access_token(rdpContext* context);
FREERDP_API pGetCommonAccessToken freerdp_get_common_access_token(const rdpContext* context);
#ifdef __cplusplus
}

10
libfreerdp/core/credssp_auth.c
View File

@@ -665,7 +665,7 @@ void credssp_auth_take_input_buffer(rdpCredsspAuth* auth, SecBuffer* buffer)
*buffer = empty;
}
const SecBuffer* credssp_auth_get_output_buffer(rdpCredsspAuth* auth)
const SecBuffer* credssp_auth_get_output_buffer(const rdpCredsspAuth* auth)
{
WINPR_ASSERT(auth);
return &auth->output_buffer;
@@ -677,25 +677,25 @@ BOOL credssp_auth_have_output_token(rdpCredsspAuth* auth)
return auth->output_buffer.cbBuffer ? TRUE : FALSE;
}
BOOL credssp_auth_is_complete(rdpCredsspAuth* auth)
BOOL credssp_auth_is_complete(const rdpCredsspAuth* auth)
{
WINPR_ASSERT(auth);
return auth->state == AUTH_STATE_FINAL;
}
size_t credssp_auth_trailer_size(rdpCredsspAuth* auth)
size_t credssp_auth_trailer_size(const rdpCredsspAuth* auth)
{
WINPR_ASSERT(auth);
return auth->sizes.cbSecurityTrailer;
}
const char* credssp_auth_pkg_name(rdpCredsspAuth* auth)
const char* credssp_auth_pkg_name(const rdpCredsspAuth* auth)
{
WINPR_ASSERT(auth && auth->info);
return auth->pkgNameA;
}
INT32 credssp_auth_sspi_error(rdpCredsspAuth* auth)
INT32 credssp_auth_sspi_error(const rdpCredsspAuth* auth)
{
WINPR_ASSERT(auth);
return auth->sspi_error;

10
libfreerdp/core/credssp_auth.h
View File

@@ -56,12 +56,12 @@ FREERDP_LOCAL BOOL credssp_auth_revert_to_self(rdpCredsspAuth* auth);
FREERDP_LOCAL BOOL credssp_auth_set_spn(rdpCredsspAuth* auth, const char* service,
const char* hostname);
FREERDP_LOCAL void credssp_auth_take_input_buffer(rdpCredsspAuth* auth, SecBuffer* buffer);
FREERDP_LOCAL const SecBuffer* credssp_auth_get_output_buffer(rdpCredsspAuth* auth);
FREERDP_LOCAL const SecBuffer* credssp_auth_get_output_buffer(const rdpCredsspAuth* auth);
FREERDP_LOCAL BOOL credssp_auth_have_output_token(rdpCredsspAuth* auth);
FREERDP_LOCAL BOOL credssp_auth_is_complete(rdpCredsspAuth* auth);
FREERDP_LOCAL const char* credssp_auth_pkg_name(rdpCredsspAuth* auth);
FREERDP_LOCAL size_t credssp_auth_trailer_size(rdpCredsspAuth* auth);
FREERDP_LOCAL INT32 credssp_auth_sspi_error(rdpCredsspAuth* auth);
FREERDP_LOCAL BOOL credssp_auth_is_complete(const rdpCredsspAuth* auth);
FREERDP_LOCAL const char* credssp_auth_pkg_name(const rdpCredsspAuth* auth);
FREERDP_LOCAL size_t credssp_auth_trailer_size(const rdpCredsspAuth* auth);
FREERDP_LOCAL INT32 credssp_auth_sspi_error(const rdpCredsspAuth* auth);
FREERDP_LOCAL void credssp_auth_tableAndContext(rdpCredsspAuth* auth,
SecurityFunctionTable** ptable,

21
libfreerdp/core/freerdp.c
View File

@@ -677,7 +677,7 @@ BOOL freerdp_reconnect(freerdp* instance)
}
#if !defined(WITHOUT_FREERDP_3x_DEPRECATED)
BOOL freerdp_shall_disconnect(freerdp* instance)
BOOL freerdp_shall_disconnect(const freerdp* instance)
{
if (!instance)
return FALSE;
@@ -1015,13 +1015,13 @@ void freerdp_context_free(freerdp* instance)
instance->heartbeat = NULL; /* owned by rdpRdp */
}
int freerdp_get_disconnect_ultimatum(rdpContext* context)
int freerdp_get_disconnect_ultimatum(const rdpContext* context)
{
WINPR_ASSERT(context);
return context->disconnectUltimatum;
}
UINT32 freerdp_error_info(freerdp* instance)
UINT32 freerdp_error_info(const freerdp* instance)
{
WINPR_ASSERT(instance);
WINPR_ASSERT(instance->context);
@@ -1045,7 +1045,7 @@ BOOL freerdp_send_error_info(rdpRdp* rdp)
return rdp_send_error_info(rdp);
}
UINT32 freerdp_get_last_error(rdpContext* context)
UINT32 freerdp_get_last_error(const rdpContext* context)
{
WINPR_ASSERT(context);
return context->LastError;
@@ -1259,7 +1259,7 @@ void freerdp_free(freerdp* instance)
free(instance);
}
ULONG freerdp_get_transport_sent(rdpContext* context, BOOL resetCount)
ULONG freerdp_get_transport_sent(const rdpContext* context, BOOL resetCount)
{
WINPR_ASSERT(context);
WINPR_ASSERT(context->rdp);
@@ -1301,14 +1301,13 @@ BOOL freerdp_nla_revert_to_self(rdpContext* context)
return nla_revert_to_self(nla);
}
UINT32 freerdp_get_nla_sspi_error(rdpContext* context)
UINT32 freerdp_get_nla_sspi_error(const rdpContext* context)
{
WINPR_ASSERT(context);
WINPR_ASSERT(context->rdp);
WINPR_ASSERT(context->rdp->transport);
rdpNla* nla = transport_get_nla(context->rdp->transport);
return (UINT32)nla_get_sspi_error(nla);
}
@@ -1363,13 +1362,13 @@ BOOL checkChannelErrorEvent(rdpContext* context)
*
* @return 0 on success, otherwise a Win32 error code
*/
UINT getChannelError(rdpContext* context)
UINT getChannelError(const rdpContext* context)
{
WINPR_ASSERT(context);
return context->channelErrorNum;
}
const char* getChannelErrorDescription(rdpContext* context)
const char* getChannelErrorDescription(const rdpContext* context)
{
WINPR_ASSERT(context);
return context->errorDescription;
@@ -1397,7 +1396,7 @@ void setChannelError(rdpContext* context, UINT errorNum, WINPR_FORMAT_ARG const
(void)SetEvent(context->channelErrorEvent);
}
const char* freerdp_nego_get_routing_token(rdpContext* context, DWORD* length)
const char* freerdp_nego_get_routing_token(const rdpContext* context, DWORD* length)
{
if (!context || !context->rdp)
return NULL;
@@ -1579,7 +1578,7 @@ BOOL freerdp_set_common_access_token(rdpContext* context,
return TRUE;
}
pGetCommonAccessToken freerdp_get_common_access_token(rdpContext* context)
pGetCommonAccessToken freerdp_get_common_access_token(const rdpContext* context)
{
WINPR_ASSERT(context);
WINPR_ASSERT(context->rdp);

10
libfreerdp/core/nego.c
View File

@@ -1761,7 +1761,7 @@ void nego_set_RCG_supported(rdpNego* nego, BOOL enabled)
nego->RemoteCredsGuardSupported = enabled;
}
BOOL nego_get_remoteCredentialGuard(rdpNego* nego)
BOOL nego_get_remoteCredentialGuard(const rdpNego* nego)
{
WINPR_ASSERT(nego);
@@ -1967,7 +1967,7 @@ void nego_set_preconnection_blob(rdpNego* nego, const char* PreconnectionBlob)
nego->PreconnectionBlob = PreconnectionBlob;
}
UINT32 nego_get_selected_protocol(rdpNego* nego)
UINT32 nego_get_selected_protocol(const rdpNego* nego)
{
if (!nego)
return 0;
@@ -1982,7 +1982,7 @@ BOOL nego_set_selected_protocol(rdpNego* nego, UINT32 SelectedProtocol)
return TRUE;
}
UINT32 nego_get_requested_protocols(rdpNego* nego)
UINT32 nego_get_requested_protocols(const rdpNego* nego)
{
if (!nego)
return 0;
@@ -1999,7 +1999,7 @@ BOOL nego_set_requested_protocols(rdpNego* nego, UINT32 RequestedProtocols)
return TRUE;
}
NEGO_STATE nego_get_state(rdpNego* nego)
NEGO_STATE nego_get_state(const rdpNego* nego)
{
if (!nego)
return NEGO_STATE_FAIL;
@@ -2034,7 +2034,7 @@ void nego_free_nla(rdpNego* nego)
transport_set_nla(nego->transport, NULL);
}
const BYTE* nego_get_routing_token(rdpNego* nego, DWORD* RoutingTokenLength)
const BYTE* nego_get_routing_token(const rdpNego* nego, DWORD* RoutingTokenLength)
{
if (!nego)
return NULL;

10
libfreerdp/core/nego.h
View File

@@ -119,7 +119,7 @@ FREERDP_LOCAL void nego_set_restricted_admin_mode_required(rdpNego* nego,
FREERDP_LOCAL void nego_set_restricted_admin_mode_supported(rdpNego* nego, BOOL enabled);
FREERDP_LOCAL void nego_set_RCG_required(rdpNego* nego, BOOL enabled);
FREERDP_LOCAL void nego_set_RCG_supported(rdpNego* nego, BOOL enabled);
FREERDP_LOCAL BOOL nego_get_remoteCredentialGuard(rdpNego* nego);
FREERDP_LOCAL BOOL nego_get_remoteCredentialGuard(const rdpNego* nego);
FREERDP_LOCAL void nego_set_childsession_enabled(rdpNego* nego, BOOL ChildSessionEnabled);
FREERDP_LOCAL void nego_set_gateway_enabled(rdpNego* nego, BOOL GatewayEnabled);
FREERDP_LOCAL void nego_set_gateway_bypass_local(rdpNego* nego, BOOL GatewayBypassLocal);
@@ -129,7 +129,7 @@ FREERDP_LOCAL void nego_enable_nla(rdpNego* nego, BOOL enable_nla);
FREERDP_LOCAL void nego_enable_rdstls(rdpNego* nego, BOOL enable_rdstls);
FREERDP_LOCAL void nego_enable_aad(rdpNego* nego, BOOL enable_aad);
FREERDP_LOCAL void nego_enable_ext(rdpNego* nego, BOOL enable_ext);
FREERDP_LOCAL const BYTE* nego_get_routing_token(rdpNego* nego, DWORD* RoutingTokenLength);
FREERDP_LOCAL const BYTE* nego_get_routing_token(const rdpNego* nego, DWORD* RoutingTokenLength);
FREERDP_LOCAL BOOL nego_set_routing_token(rdpNego* nego, const void* RoutingToken,
DWORD RoutingTokenLength);
FREERDP_LOCAL BOOL nego_set_cookie(rdpNego* nego, const char* cookie);
@@ -138,16 +138,16 @@ FREERDP_LOCAL void nego_set_send_preconnection_pdu(rdpNego* nego, BOOL SendPreco
FREERDP_LOCAL void nego_set_preconnection_id(rdpNego* nego, UINT32 PreconnectionId);
FREERDP_LOCAL void nego_set_preconnection_blob(rdpNego* nego, const char* PreconnectionBlob);
FREERDP_LOCAL UINT32 nego_get_selected_protocol(rdpNego* nego);
FREERDP_LOCAL UINT32 nego_get_selected_protocol(const rdpNego* nego);
FREERDP_LOCAL BOOL nego_set_selected_protocol(rdpNego* nego, UINT32 SelectedProtocol);
FREERDP_LOCAL UINT32 nego_get_requested_protocols(rdpNego* nego);
FREERDP_LOCAL UINT32 nego_get_requested_protocols(const rdpNego* nego);
FREERDP_LOCAL BOOL nego_set_requested_protocols(rdpNego* nego, UINT32 RequestedProtocols);
FREERDP_LOCAL BOOL nego_update_settings_from_state(rdpNego* nego, rdpSettings* settings);
FREERDP_LOCAL BOOL nego_set_state(rdpNego* nego, NEGO_STATE state);
FREERDP_LOCAL NEGO_STATE nego_get_state(rdpNego* nego);
FREERDP_LOCAL NEGO_STATE nego_get_state(const rdpNego* nego);
FREERDP_LOCAL SEC_WINNT_AUTH_IDENTITY* nego_get_identity(rdpNego* nego);

6
libfreerdp/core/nla.c
View File

@@ -2169,7 +2169,7 @@ SEC_WINNT_AUTH_IDENTITY* nla_get_identity(rdpNla* nla)
return nla->identity;
}
NLA_STATE nla_get_state(rdpNla* nla)
NLA_STATE nla_get_state(const rdpNla* nla)
{
if (!nla)
return NLA_STATE_FINAL;
@@ -2227,14 +2227,14 @@ const char* nla_get_state_str(NLA_STATE state)
}
}
DWORD nla_get_error(rdpNla* nla)
DWORD nla_get_error(const rdpNla* nla)
{
if (!nla)
return ERROR_INTERNAL_ERROR;
return (UINT32)nla->errorCode;
}
INT32 nla_get_sspi_error(rdpNla* nla)
INT32 nla_get_sspi_error(const rdpNla* nla)
{
WINPR_ASSERT(nla);
return credssp_auth_sspi_error(nla->auth);

6
libfreerdp/core/nla.h
View File

@@ -53,12 +53,12 @@ FREERDP_LOCAL int nla_recv_pdu(rdpNla* nla, wStream* s);
FREERDP_LOCAL SEC_WINNT_AUTH_IDENTITY* nla_get_identity(rdpNla* nla);
FREERDP_LOCAL NLA_STATE nla_get_state(rdpNla* nla);
FREERDP_LOCAL NLA_STATE nla_get_state(const rdpNla* nla);
FREERDP_LOCAL BOOL nla_set_state(rdpNla* nla, NLA_STATE state);
FREERDP_LOCAL const char* nla_get_state_str(NLA_STATE state);
FREERDP_LOCAL DWORD nla_get_error(rdpNla* nla);
FREERDP_LOCAL INT32 nla_get_sspi_error(rdpNla* nla);
FREERDP_LOCAL DWORD nla_get_error(const rdpNla* nla);
FREERDP_LOCAL INT32 nla_get_sspi_error(const rdpNla* nla);
FREERDP_LOCAL BOOL nla_set_service_principal(rdpNla* nla, const char* service,
const char* hostname);

2
libfreerdp/core/rdp.c
View File

@@ -2285,7 +2285,7 @@ int rdp_check_fds(rdpRdp* rdp)
return status;
}
BOOL freerdp_get_stats(rdpRdp* rdp, UINT64* inBytes, UINT64* outBytes, UINT64* inPackets,
BOOL freerdp_get_stats(const rdpRdp* rdp, UINT64* inBytes, UINT64* outBytes, UINT64* inPackets,
UINT64* outPackets)
{
if (!rdp)

4
libfreerdp/core/transport.c
View File

@@ -1767,7 +1767,7 @@ BOOL transport_set_io_callbacks(rdpTransport* transport, const rdpTransportIo* i
return TRUE;
}
const rdpTransportIo* transport_get_io_callbacks(rdpTransport* transport)
const rdpTransportIo* transport_get_io_callbacks(const rdpTransport* transport)
{
if (!transport)
return NULL;
@@ -1874,7 +1874,7 @@ BOOL transport_set_recv_callbacks(rdpTransport* transport, TransportRecv recv, v
return TRUE;
}
BOOL transport_get_blocking(rdpTransport* transport)
BOOL transport_get_blocking(const rdpTransport* transport)
{
WINPR_ASSERT(transport);
return transport->blocking;

4
libfreerdp/core/transport.h
View File

@@ -127,7 +127,7 @@ FREERDP_LOCAL int transport_drain_output_buffer(rdpTransport* transport);
FREERDP_LOCAL BOOL transport_io_callback_set_event(rdpTransport* transport, BOOL set);
FREERDP_LOCAL const rdpTransportIo* transport_get_io_callbacks(rdpTransport* transport);
FREERDP_LOCAL const rdpTransportIo* transport_get_io_callbacks(const rdpTransport* transport);
FREERDP_LOCAL BOOL transport_set_io_callbacks(rdpTransport* transport,
const rdpTransportIo* io_callbacks);
@@ -149,7 +149,7 @@ FREERDP_LOCAL BOOL transport_have_more_bytes_to_read(rdpTransport* transport);
FREERDP_LOCAL TRANSPORT_LAYER transport_get_layer(rdpTransport* transport);
FREERDP_LOCAL BOOL transport_set_layer(rdpTransport* transport, TRANSPORT_LAYER layer);
FREERDP_LOCAL BOOL transport_get_blocking(rdpTransport* transport);
FREERDP_LOCAL BOOL transport_get_blocking(const rdpTransport* transport);
FREERDP_LOCAL BOOL transport_set_blocking(rdpTransport* transport, BOOL blocking);
FREERDP_LOCAL BOOL transport_set_connected_event(rdpTransport* transport);