mirrors
/
FreeRDP
mirror of https://github.com/FreeRDP/FreeRDP
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[cleanup] fix compiler warnings

This commit is contained in:
akallabeth 2023-01-13 13:25:32 +01:00 committed by akallabeth
parent 353d796476
commit ee07a13130
11 changed files with 29 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/freerdp/rail.h
View File

@ -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

2
include/freerdp/server/proxy/proxy_config.h
View File

@ -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 */

2
include/freerdp/server/proxy/proxy_types.h
View File

@ -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 */

2
include/freerdp/settings.h
View File

@ -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 */

10
libfreerdp/core/server.c
View File

@ -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);

2
libfreerdp/primitives/prim_copy.c
View File

@ -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

9
server/proxy/channels/pf_channel_drdynvc.c
View File

@ -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;

5
server/proxy/channels/pf_channel_rdpdr.c
View File

@ -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);

11
server/proxy/pf_channel.c
View File

@ -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;
}

4
winpr/libwinpr/crt/test/TestUnicodeConversion.c
View File

@ -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;

2
winpr/libwinpr/sspi/Kerberos/krb5glue.h
View File

@ -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 */
#endif /* WINPR_SSPI_KERBEROS_GLUE_PRIVATE_H */