From ee07a131305d6ae5100b49ca127af6d28fa372c1 Mon Sep 17 00:00:00 2001 From: akallabeth Date: Fri, 13 Jan 2023 13:25:32 +0100 Subject: [PATCH] [cleanup] fix compiler warnings --- include/freerdp/rail.h | 2 +- include/freerdp/server/proxy/proxy_config.h | 2 +- include/freerdp/server/proxy/proxy_types.h | 2 +- include/freerdp/settings.h | 2 +- libfreerdp/core/server.c | 10 +++++----- libfreerdp/primitives/prim_copy.c | 2 ++ server/proxy/channels/pf_channel_drdynvc.c | 9 ++++++--- server/proxy/channels/pf_channel_rdpdr.c | 5 ++--- server/proxy/pf_channel.c | 11 +++++++---- winpr/libwinpr/crt/test/TestUnicodeConversion.c | 4 ++-- winpr/libwinpr/sspi/Kerberos/krb5glue.h | 2 +- 11 files changed, 29 insertions(+), 22 deletions(-) diff --git a/include/freerdp/rail.h b/include/freerdp/rail.h index fb0913a85..9105786f7 100644 --- a/include/freerdp/rail.h +++ b/include/freerdp/rail.h @@ -88,7 +88,7 @@ enum SPI_MASK SPI_MASK_SET_CARET_WIDTH = 0x00000400, SPI_MASK_SET_STICKY_KEYS = 0x00000800, SPI_MASK_SET_TOGGLE_KEYS = 0x00001000, - SPI_MASK_SET_FILTER_KEYS = 0x00002000, + SPI_MASK_SET_FILTER_KEYS = 0x00002000 }; /* Client System Parameters Update PDU diff --git a/include/freerdp/server/proxy/proxy_config.h b/include/freerdp/server/proxy/proxy_config.h index d95cbc8ff..b40a5c44c 100644 --- a/include/freerdp/server/proxy/proxy_config.h +++ b/include/freerdp/server/proxy/proxy_config.h @@ -206,6 +206,6 @@ extern "C" FREERDP_API BOOL pf_config_plugin(proxyPluginsManager* plugins_manager, void* userdata); #ifdef __cplusplus -}; +} #endif #endif /* FREERDP_SERVER_PROXY_CONFIG_H */ diff --git a/include/freerdp/server/proxy/proxy_types.h b/include/freerdp/server/proxy/proxy_types.h index 4dbba1b62..756164ec3 100644 --- a/include/freerdp/server/proxy/proxy_types.h +++ b/include/freerdp/server/proxy/proxy_types.h @@ -27,7 +27,7 @@ typedef enum PF_UTILS_CHANNEL_NOT_HANDLED, /*!< channel not handled */ PF_UTILS_CHANNEL_BLOCK, /*!< block and drop traffic on this channel */ PF_UTILS_CHANNEL_PASSTHROUGH, /*!< pass traffic from this channel */ - PF_UTILS_CHANNEL_INTERCEPT, /*!< inspect traffic from this channel */ + PF_UTILS_CHANNEL_INTERCEPT /*!< inspect traffic from this channel */ } pf_utils_channel_mode; /** @brief result of a channel treatment */ diff --git a/include/freerdp/settings.h b/include/freerdp/settings.h index 02b218894..ce403c53b 100644 --- a/include/freerdp/settings.h +++ b/include/freerdp/settings.h @@ -118,7 +118,7 @@ typedef enum RDP_VERSION_10_8 = 0x0008000D, RDP_VERSION_10_9 = 0x0008000E, RDP_VERSION_10_10 = 0x0008000F, - RDP_VERSION_10_11 = 0x00080010, + RDP_VERSION_10_11 = 0x00080010 } RDP_VERSION; /* Color depth */ diff --git a/libfreerdp/core/server.c b/libfreerdp/core/server.c index 040577ce9..b0cde3c86 100644 --- a/libfreerdp/core/server.c +++ b/libfreerdp/core/server.c @@ -272,11 +272,11 @@ static void wts_read_drdynvc_close_response(rdpPeerChannel* channel) static BOOL wts_read_drdynvc_pdu(rdpPeerChannel* channel) { UINT32 length; - int value; - int Cmd; - int Sp; - int cbChId; - UINT32 ChannelId; + UINT8 value; + UINT8 Cmd; + UINT8 Sp; + UINT8 cbChId; + UINT32 ChannelId = 0; rdpPeerChannel* dvc = NULL; WINPR_ASSERT(channel); diff --git a/libfreerdp/primitives/prim_copy.c b/libfreerdp/primitives/prim_copy.c index d07d30d00..78530ac30 100644 --- a/libfreerdp/primitives/prim_copy.c +++ b/libfreerdp/primitives/prim_copy.c @@ -155,6 +155,7 @@ void primitives_init_copy(primitives_t* prims) prims->copy = (__copy_t)(prims->copy_8u); } +#if defined(WITH_SSE2) || defined(WITH_NEON) void primitives_init_copy_opt(primitives_t* prims) { generic = primitives_get_generic(); @@ -174,3 +175,4 @@ void primitives_init_copy_opt(primitives_t* prims) /* This is just an alias with void* parameters */ prims->copy = (__copy_t)(prims->copy_8u); } +#endif diff --git a/server/proxy/channels/pf_channel_drdynvc.c b/server/proxy/channels/pf_channel_drdynvc.c index 727d42648..ba4b4e79d 100644 --- a/server/proxy/channels/pf_channel_drdynvc.c +++ b/server/proxy/channels/pf_channel_drdynvc.c @@ -236,9 +236,12 @@ static PfChannelResult DynvcTrackerPeekFn(ChannelStateTracker* tracker, BOOL fir const char* direction = isBackData ? "B->F" : "F->B"; - wStream* currentPacket = channelTracker_getCurrentPacket(tracker); - s = Stream_StaticConstInit(&sbuffer, Stream_Buffer(currentPacket), - Stream_GetPosition(currentPacket)); + { + wStream* currentPacket = channelTracker_getCurrentPacket(tracker); + s = Stream_StaticConstInit(&sbuffer, Stream_Buffer(currentPacket), + Stream_GetPosition(currentPacket)); + } + if (!Stream_CheckAndLogRequiredLength(TAG, s, 1)) return PF_CHANNEL_RESULT_ERROR; diff --git a/server/proxy/channels/pf_channel_rdpdr.c b/server/proxy/channels/pf_channel_rdpdr.c index 4d81df288..2f7e6af8f 100644 --- a/server/proxy/channels/pf_channel_rdpdr.c +++ b/server/proxy/channels/pf_channel_rdpdr.c @@ -1080,9 +1080,9 @@ static BOOL pf_channel_rdpdr_rewrite_device_list_to(wStream* s, UINT32 fromVersi goto fail; Stream_Write_UINT32(s, datalen); - const SSIZE_T rc = Stream_Write_UTF16_String_From_UTF8( + const SSIZE_T rcw = Stream_Write_UTF16_String_From_UTF8( s, charCount, device.PreferredDosName, charCount - 1, TRUE); - if (rc < 0) + if (rcw < 0) goto fail; } } @@ -1270,7 +1270,6 @@ BOOL pf_channel_send_client_queue(pClientContext* pc, pf_channel_client_context* { CLIENT_TX_LOG(rdpdr->log, WLOG_ERROR, "xxxxxx TODO: Failed to send data!"); } - skip: Stream_Free(s, TRUE); } Queue_Unlock(rdpdr->queue); diff --git a/server/proxy/pf_channel.c b/server/proxy/pf_channel.c index 858c4d7c9..c13ae2db5 100644 --- a/server/proxy/pf_channel.c +++ b/server/proxy/pf_channel.c @@ -107,10 +107,12 @@ PfChannelResult channelTracker_update(ChannelStateTracker* tracker, const BYTE* tracker->currentPacketFragments = 0; } - const size_t currentPacketSize = channelTracker_getCurrentPacketSize(tracker); - if (tracker->currentPacketReceived + xsize > currentPacketSize) - WLog_INFO(TAG, "cumulated size is bigger (%" PRIuz ") than total size (%" PRIuz ")", - tracker->currentPacketReceived + xsize, currentPacketSize); + { + const size_t currentPacketSize = channelTracker_getCurrentPacketSize(tracker); + if (tracker->currentPacketReceived + xsize > currentPacketSize) + WLog_INFO(TAG, "cumulated size is bigger (%" PRIuz ") than total size (%" PRIuz ")", + tracker->currentPacketReceived + xsize, currentPacketSize); + } tracker->currentPacketReceived += xsize; tracker->currentPacketFragments++; @@ -346,4 +348,5 @@ BOOL channelTracker_setCurrentPacketSize(ChannelStateTracker* tracker, size_t si { WINPR_ASSERT(tracker); tracker->currentPacketSize = size; + return TRUE; } diff --git a/winpr/libwinpr/crt/test/TestUnicodeConversion.c b/winpr/libwinpr/crt/test/TestUnicodeConversion.c index e37e581d0..0089836ef 100644 --- a/winpr/libwinpr/crt/test/TestUnicodeConversion.c +++ b/winpr/libwinpr/crt/test/TestUnicodeConversion.c @@ -51,7 +51,7 @@ static BOOL check_short_buffer(const char* prefix, int rc, size_t buffersize, if (buffersize > len) { fprintf(stderr, - "%s length does not match buffersize: %" PRIdz " != %" PRId32 + "%s length does not match buffersize: %" PRId32 " != %" PRIuz ",but is large enough to hold result\n", prefix, rc, buffersize); return FALSE; @@ -61,7 +61,7 @@ static BOOL check_short_buffer(const char* prefix, int rc, size_t buffersize, { fprintf(stderr, - "%s length does not match buffersize: %" PRIdz " != %" PRId32 + "%s length does not match buffersize: %" PRId32 " != %" PRIuz ", unexpected GetLastError() 0x08%" PRIx32 "\n", prefix, rc, buffersize, err); return FALSE; diff --git a/winpr/libwinpr/sspi/Kerberos/krb5glue.h b/winpr/libwinpr/sspi/Kerberos/krb5glue.h index db0f5b0c5..d325f16f0 100644 --- a/winpr/libwinpr/sspi/Kerberos/krb5glue.h +++ b/winpr/libwinpr/sspi/Kerberos/krb5glue.h @@ -104,4 +104,4 @@ krb5_error_code krb5glue_get_init_creds(krb5_context ctx, krb5_principal princ, #endif /* WITH_KRB5 */ -#endif /* WINPR_SSPI_KERBEROS_GLUE_PRIVATE_H */ \ No newline at end of file +#endif /* WINPR_SSPI_KERBEROS_GLUE_PRIVATE_H */