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

Merge pull request #10537 from akallabeth/warnings-for-release

Browse Source 
[warnings] revert some mismatching function declarations
This commit is contained in:
akallabeth 2024-08-30 08:53:43 +02:00 committed by GitHub
commit ab9ae66a8d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
8 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
channels/rdpsnd/client/rdpsnd_main.c
View File

@ -1698,8 +1698,8 @@ static UINT rdpsnd_on_close(IWTSVirtualChannelCallback* pChannelCallback)
} }
static UINT rdpsnd_on_new_channel_connection(IWTSListenerCallback* pListenerCallback, static UINT rdpsnd_on_new_channel_connection(IWTSListenerCallback* pListenerCallback,
IWTSVirtualChannel* pChannel, const BYTE* Data, IWTSVirtualChannel* pChannel, BYTE* Data,
const BOOL* pbAccept, BOOL* pbAccept,
IWTSVirtualChannelCallback** ppCallback) IWTSVirtualChannelCallback** ppCallback)
{ {
GENERIC_CHANNEL_CALLBACK* callback = NULL; GENERIC_CHANNEL_CALLBACK* callback = NULL;

1
channels/tsmf/client/alsa/tsmf_alsa.c
View File

@ -151,7 +151,6 @@ static BOOL tsmf_alsa_play(ITSMFAudioDevice* audio, const BYTE* src, UINT32 data
if (alsa->out_handle) if (alsa->out_handle)
{ {
const size_t sbytes_per_frame = 1ULL * alsa->source_channels * alsa->bytes_per_sample;
const size_t rbytes_per_frame = 1ULL * alsa->actual_channels * alsa->bytes_per_sample; const size_t rbytes_per_frame = 1ULL * alsa->actual_channels * alsa->bytes_per_sample;
pindex = src; pindex = src;
end = pindex + data_size; end = pindex + data_size;

3
channels/urbdrc/client/data_transfer.c
View File

@ -121,12 +121,11 @@ static UINT urbdrc_process_register_request_callback(IUDEVICE* pdev,
{ {
UINT32 NumRequestCompletion = 0; UINT32 NumRequestCompletion = 0;
UINT32 RequestCompletion = 0; UINT32 RequestCompletion = 0;
URBDRC_PLUGIN* urbdrc = NULL;
if (!callback || !s || !udevman || !pdev) if (!callback || !s || !udevman || !pdev)
return ERROR_INVALID_PARAMETER; return ERROR_INVALID_PARAMETER;
urbdrc = (URBDRC_PLUGIN*)callback->plugin; URBDRC_PLUGIN* urbdrc = (URBDRC_PLUGIN*)callback->plugin;
if (!urbdrc) if (!urbdrc)
return ERROR_INVALID_PARAMETER; return ERROR_INVALID_PARAMETER;

8
channels/video/client/video_main.c
View File

@ -1014,8 +1014,8 @@ static UINT video_data_on_close(IWTSVirtualChannelCallback* pChannelCallback)
* @return 0 on success, otherwise a Win32 error code * @return 0 on success, otherwise a Win32 error code
*/ */
static UINT video_control_on_new_channel_connection(IWTSListenerCallback* listenerCallback, static UINT video_control_on_new_channel_connection(IWTSListenerCallback* listenerCallback,
IWTSVirtualChannel* channel, const BYTE* Data, IWTSVirtualChannel* channel, BYTE* Data,
const BOOL* pbAccept, BOOL* pbAccept,
IWTSVirtualChannelCallback** ppCallback) IWTSVirtualChannelCallback** ppCallback)
{ {
GENERIC_CHANNEL_CALLBACK* callback = NULL; GENERIC_CHANNEL_CALLBACK* callback = NULL;
@ -1044,8 +1044,8 @@ static UINT video_control_on_new_channel_connection(IWTSListenerCallback* listen
} }
static UINT video_data_on_new_channel_connection(IWTSListenerCallback* pListenerCallback, static UINT video_data_on_new_channel_connection(IWTSListenerCallback* pListenerCallback,
IWTSVirtualChannel* pChannel, const BYTE* Data, IWTSVirtualChannel* pChannel, BYTE* Data,
const BOOL* pbAccept, BOOL* pbAccept,
IWTSVirtualChannelCallback** ppCallback) IWTSVirtualChannelCallback** ppCallback)
{ {
GENERIC_CHANNEL_CALLBACK* callback = NULL; GENERIC_CHANNEL_CALLBACK* callback = NULL;

3
libfreerdp/codec/dsp.c
View File

@ -1127,7 +1127,8 @@ FREERDP_DSP_CONTEXT* freerdp_dsp_context_new(BOOL encoder)
if (!context) if (!context)
return NULL; return NULL;
freerdp_dsp_common_context_init(&context->common, encoder); if (!freerdp_dsp_common_context_init(&context->common, encoder))
goto fail;
#if defined(WITH_GSM) #if defined(WITH_GSM)
context->gsm = gsm_create(); context->gsm = gsm_create();

2
libfreerdp/core/gateway/rdg.c
View File

@ -2070,7 +2070,7 @@ static int rdg_bio_puts(BIO* bio, const char* str)
return -2; return -2;
} }
static int rdg_bio_gets(BIO* bio, const char* str, int size) static int rdg_bio_gets(BIO* bio, char* str, int size)
{ {
WINPR_UNUSED(bio); WINPR_UNUSED(bio);
WINPR_UNUSED(str); WINPR_UNUSED(str);

2
libfreerdp/core/gateway/tsg.c
View File

@ -2970,7 +2970,7 @@ static int transport_bio_tsg_puts(BIO* bio, const char* str)
return 1; return 1;
} }
static int transport_bio_tsg_gets(BIO* bio, const char* str, int size) static int transport_bio_tsg_gets(BIO* bio, char* str, int size)
{ {
WINPR_UNUSED(bio); WINPR_UNUSED(bio);
WINPR_UNUSED(str); WINPR_UNUSED(str);

2
libfreerdp/primitives/prim_YUV.c
View File

@ -632,7 +632,7 @@ static INLINE BYTE RGB2V(INT32 R, INT32 G, INT32 B)
static pstatus_t general_RGBToYUV444_8u_P3AC4R(const BYTE* WINPR_RESTRICT pSrc, UINT32 SrcFormat, static pstatus_t general_RGBToYUV444_8u_P3AC4R(const BYTE* WINPR_RESTRICT pSrc, UINT32 SrcFormat,
const UINT32 srcStep, BYTE* WINPR_RESTRICT pDst[3], const UINT32 srcStep, BYTE* WINPR_RESTRICT pDst[3],
const UINT32 dstStep[3], UINT32 dstStep[3],
const prim_size_t* WINPR_RESTRICT roi) const prim_size_t* WINPR_RESTRICT roi)
{ {
const UINT32 bpp = FreeRDPGetBytesPerPixel(SrcFormat); const UINT32 bpp = FreeRDPGetBytesPerPixel(SrcFormat);