From ceb7bd1d414965e54861e5a9b318d6ae25ca8ae6 Mon Sep 17 00:00:00 2001 From: akallabeth Date: Fri, 17 Nov 2023 09:13:08 +0100 Subject: [PATCH] [warnings] fixed clang build warnings --- channels/ainput/client/ainput_main.c | 2 +- channels/disp/client/disp_main.c | 2 +- channels/echo/client/echo_main.c | 2 +- channels/geometry/client/geometry_main.c | 2 +- channels/printer/client/cups/printer_cups.c | 6 +++--- channels/rdpei/client/rdpei_main.c | 2 +- channels/rdpgfx/client/rdpgfx_main.c | 3 ++- libfreerdp/codec/ncrush.c | 14 ++++++++------ libfreerdp/core/childsession.c | 2 -- libfreerdp/core/info.c | 1 - 10 files changed, 18 insertions(+), 18 deletions(-) diff --git a/channels/ainput/client/ainput_main.c b/channels/ainput/client/ainput_main.c index 907a8f2f0..0e3e96c62 100644 --- a/channels/ainput/client/ainput_main.c +++ b/channels/ainput/client/ainput_main.c @@ -168,7 +168,7 @@ static void terminate_plugin_cb(GENERIC_DYNVC_PLUGIN* base) static const IWTSVirtualChannelCallback ainput_functions = { ainput_on_data_received, NULL, /* Open */ - ainput_on_close }; + ainput_on_close, NULL }; /** * Function description diff --git a/channels/disp/client/disp_main.c b/channels/disp/client/disp_main.c index d6eef5ba9..e757e6a5d 100644 --- a/channels/disp/client/disp_main.c +++ b/channels/disp/client/disp_main.c @@ -308,7 +308,7 @@ static void disp_plugin_terminated(GENERIC_DYNVC_PLUGIN* base) } static const IWTSVirtualChannelCallback disp_callbacks = { disp_on_data_received, NULL, /* Open */ - disp_on_close }; + disp_on_close, NULL }; /** * Function description diff --git a/channels/echo/client/echo_main.c b/channels/echo/client/echo_main.c index 6b7ebee25..c4e1c226e 100644 --- a/channels/echo/client/echo_main.c +++ b/channels/echo/client/echo_main.c @@ -77,7 +77,7 @@ static UINT echo_on_close(IWTSVirtualChannelCallback* pChannelCallback) } static const IWTSVirtualChannelCallback echo_callbacks = { echo_on_data_received, NULL, /* Open */ - echo_on_close }; + echo_on_close, NULL }; /** * Function description diff --git a/channels/geometry/client/geometry_main.c b/channels/geometry/client/geometry_main.c index 482ea681f..8b630b362 100644 --- a/channels/geometry/client/geometry_main.c +++ b/channels/geometry/client/geometry_main.c @@ -329,7 +329,7 @@ static void mappedGeometryUnref_void(void* arg) static const IWTSVirtualChannelCallback geometry_callbacks = { geometry_on_data_received, NULL, /* Open */ - geometry_on_close }; + geometry_on_close, NULL }; static UINT init_plugin_cb(GENERIC_DYNVC_PLUGIN* base, rdpContext* rcontext, rdpSettings* settings) { diff --git a/channels/printer/client/cups/printer_cups.c b/channels/printer/client/cups/printer_cups.c index 373ffdcf8..09e1bc76d 100644 --- a/channels/printer/client/cups/printer_cups.c +++ b/channels/printer/client/cups/printer_cups.c @@ -43,7 +43,7 @@ #include #define TAG CHANNELS_TAG("printer.client.cups") -#if __APPLE__ +#if defined(__APPLE__) #include #include @@ -308,7 +308,7 @@ static rdpPrinter* printer_cups_new_printer(rdpCupsPrinterDriver* cups_driver, c else { const char* dname = "MS Publisher Imagesetter"; -#if __APPLE__ +#if defined(__APPLE__) if (is_mac_os_sonoma_or_later()) dname = "Microsoft Print to PDF"; #endif @@ -352,7 +352,7 @@ static void printer_cups_release_enum_printers(rdpPrinter** printers) static rdpPrinter** printer_cups_enum_printers(rdpPrinterDriver* driver) { - rdpPrinter** printers; + rdpPrinter** printers = NULL; int num_printers = 0; cups_dest_t* dests = NULL; cups_dest_t* dest = NULL; diff --git a/channels/rdpei/client/rdpei_main.c b/channels/rdpei/client/rdpei_main.c index dff6d6476..9d29d7f3a 100644 --- a/channels/rdpei/client/rdpei_main.c +++ b/channels/rdpei/client/rdpei_main.c @@ -1460,7 +1460,7 @@ static void terminate_plugin_cb(GENERIC_DYNVC_PLUGIN* base) static const IWTSVirtualChannelCallback geometry_callbacks = { rdpei_on_data_received, NULL, /* Open */ - rdpei_on_close }; + rdpei_on_close, NULL }; /** * Function description diff --git a/channels/rdpgfx/client/rdpgfx_main.c b/channels/rdpgfx/client/rdpgfx_main.c index 64b861550..7e4bacf26 100644 --- a/channels/rdpgfx/client/rdpgfx_main.c +++ b/channels/rdpgfx/client/rdpgfx_main.c @@ -2405,7 +2405,8 @@ void rdpgfx_client_context_free(RdpgfxClientContext* context) } static const IWTSVirtualChannelCallback rdpgfx_callbacks = { rdpgfx_on_data_received, - rdpgfx_on_open, rdpgfx_on_close }; + rdpgfx_on_open, rdpgfx_on_close, + NULL }; /** * Function description diff --git a/libfreerdp/codec/ncrush.c b/libfreerdp/codec/ncrush.c index 44e4cd05a..914ecdc89 100644 --- a/libfreerdp/codec/ncrush.c +++ b/libfreerdp/codec/ncrush.c @@ -2177,12 +2177,14 @@ int ncrush_decompress(NCRUSH_CONTEXT* ncrush, const BYTE* pSrcData, UINT32 SrcSi if (idx >= ARRAYSIZE(HuffTableMask)) return -1; - const UINT16 Mask = get_word(&HuffTableMask[idx]); - const UINT32 MaskedBits = bits & Mask; - const UINT32 tmp = CopyOffsetBase + MaskedBits; - if (tmp < 1) - return -1; - CopyOffset = tmp - 1; + { + const UINT16 Mask = get_word(&HuffTableMask[idx]); + const UINT32 MaskedBits = bits & Mask; + const UINT32 tmp = CopyOffsetBase + MaskedBits; + if (tmp < 1) + return -1; + CopyOffset = tmp - 1; + } bits >>= CopyOffsetBits; nbits -= CopyOffsetBits; diff --git a/libfreerdp/core/childsession.c b/libfreerdp/core/childsession.c index 649c5f305..c429c613e 100644 --- a/libfreerdp/core/childsession.c +++ b/libfreerdp/core/childsession.c @@ -134,13 +134,11 @@ static long transport_bio_named_ctrl(BIO* bio, int cmd, long arg1, void* arg2) } case BIO_C_WAIT_READ: { - int timeout = (int)arg1; return 1; } case BIO_C_WAIT_WRITE: { - int timeout = (int)arg1; return 1; } diff --git a/libfreerdp/core/info.c b/libfreerdp/core/info.c index fa166e870..4a1d7c512 100644 --- a/libfreerdp/core/info.c +++ b/libfreerdp/core/info.c @@ -80,7 +80,6 @@ static BOOL rdp_read_info_null_string(rdpSettings* settings, FreeRDP_Settings_Ke size_t max) { const BOOL unicode = (flags & INFO_UNICODE) ? TRUE : FALSE; - const size_t nullSize = unicode ? sizeof(WCHAR) : sizeof(CHAR); if (!freerdp_settings_set_string(settings, id, NULL)) return FALSE;