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

[build] fix a few compiler warnings

Browse Source
This commit is contained in:
akallabeth 2023-03-13 12:53:40 +01:00 committed by Martin Fleisz
parent ecc29d00c0
commit a360f1ca8c
6 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
channels/rdpgfx/client/rdpgfx_main.c
View File

@ -47,7 +47,7 @@
static BOOL delete_surface(const void* key, void* value, void* arg)
{
const UINT16 id = (UINT16)(key);
const UINT16 id = (UINT16)(uintptr_t)(key);
RdpgfxClientContext* context = arg;
RDPGFX_DELETE_SURFACE_PDU pdu = { 0 };

2
client/SDL/sdl_utils.c
View File

@ -112,7 +112,7 @@ const char* sdl_event_type_str(Uint32 type)
const char* sdl_error_string(Uint32 res)
{
if (res >= 0)
if (res == 0)
return NULL;
return SDL_GetError();

2
client/Wayland/wlf_cliprdr.c
View File

@ -732,8 +732,6 @@ wlf_cliprdr_server_format_data_request(CliprdrClientContext* context,
clipboard = cliprdr_file_context_get_context(context->custom);
WINPR_ASSERT(clipboard);
const char* idstr = ClipboardGetFormatIdString(formatId);
const char* name = ClipboardGetFormatName(clipboard->system, formatId);
const UINT32 fileFormatId = ClipboardGetFormatId(clipboard->system, type_FileGroupDescriptorW);
const UINT32 htmlFormatId = ClipboardGetFormatId(clipboard->system, type_HtmlFormat);

21
client/X11/xf_cliprdr.c
View File

@ -139,7 +139,6 @@ static const char* mime_png = "image/png";
static const char* mime_jpeg = "image/jpeg";
static const char* mime_gif = "image/gif";
static const char* mime_nautilus_clipboard = "x-special/nautilus-clipboard";
static const char* mime_gnome_copied_files = "x-special/gnome-copied-files";
static const char* mime_mate_copied_files = "x-special/mate-copied-files";
@ -762,12 +761,14 @@ static UINT xf_cliprdr_send_format_list(xfClipboard* clipboard, const CLIPRDR_FO
if (!force && !xf_clipboard_changed(clipboard, formats, numFormats))
return CHANNEL_RC_OK;
#if defined(WITH_DEBUG_CLIPRDR)
for (UINT32 x = 0; x < numFormats; x++)
{
const CLIPRDR_FORMAT* format = &formats[x];
DEBUG_CLIPRDR("announcing format 0x%08" PRIx32 " [%s] [%s]", format->formatId,
ClipboardGetFormatIdString(format->formatId), format->formatName);
}
#endif
xf_clipboard_copy_formats(clipboard, formats, numFormats);
/* Ensure all pending requests are answered. */
@ -995,8 +996,6 @@ static BOOL xf_cliprdr_get_requested_data(xfClipboard* clipboard, Atom target)
static void xf_cliprdr_append_target(xfClipboard* clipboard, Atom target)
{
int i;
WINPR_ASSERT(clipboard);
if (clipboard->numTargets < 0)
return;
@ -1004,7 +1003,7 @@ static void xf_cliprdr_append_target(xfClipboard* clipboard, Atom target)
if ((size_t)clipboard->numTargets >= ARRAYSIZE(clipboard->targets))
return;
for (i = 0; i < clipboard->numTargets; i++)
for (int i = 0; i < clipboard->numTargets; i++)
{
if (clipboard->targets[i] == target)
return;
@ -1886,18 +1885,18 @@ xf_cliprdr_server_format_data_response(CliprdrClientContext* context,
srcFormatId = CF_RAW;
dstFormatId = CF_RAW;
}
else if (!clipboard->requestedFormat)
else if (!format)
return ERROR_INTERNAL_ERROR;
else if (clipboard->requestedFormat->formatName)
else if (format->formatName)
{
if (strcmp(clipboard->requestedFormat->formatName, type_HtmlFormat) == 0)
if (strcmp(format->formatName, type_HtmlFormat) == 0)
{
srcFormatId = ClipboardGetFormatId(clipboard->system, type_HtmlFormat);
dstFormatId = ClipboardGetFormatId(clipboard->system, mime_html);
nullTerminated = TRUE;
}
if (strcmp(clipboard->requestedFormat->formatName, type_FileGroupDescriptorW) == 0)
if (strcmp(format->formatName, type_FileGroupDescriptorW) == 0)
{
if (!cliprdr_file_context_update_server_data(clipboard->file, clipboard->system, data,
size))
@ -1920,9 +1919,9 @@ xf_cliprdr_server_format_data_response(CliprdrClientContext* context,
}
else
{
srcFormatId = clipboard->requestedFormat->formatToRequest;
dstFormatId = clipboard->requestedFormat->localFormat;
switch (clipboard->requestedFormat->formatToRequest)
srcFormatId = format->formatToRequest;
dstFormatId = format->localFormat;
switch (format->formatToRequest)
{
case CF_TEXT:
nullTerminated = TRUE;

2
client/common/file.c
View File

@ -1409,7 +1409,7 @@ size_t freerdp_client_write_rdp_file_buffer(const rdpFile* file, char* buffer, s
/* custom parameters */
for (size_t i = 0; i < file->lineCount; ++i)
{
SSIZE_T res;
SSIZE_T res = -1;
const rdpFileLine* curLine = &file->lines[i];
if (curLine->flags & RDP_FILE_LINE_FLAG_TYPE_INTEGER)

2
libfreerdp/core/aad.c
View File

@ -296,6 +296,8 @@ static BIO* aad_connect_https(rdpAad* aad, SSL_CTX* ssl_ctx)
return NULL;
}
const long mrc = SSL_CTX_set_mode(ssl_ctx, SSL_MODE_AUTO_RETRY);
if ((mrc & SSL_MODE_AUTO_RETRY) == 0)
WLog_Print(aad->log, WLOG_WARN, "Failed to set SSL_MODE_AUTO_RETRY");
BIO* bio = BIO_new_ssl_connect(ssl_ctx);
if (!bio)