From 1dcc5a180afe098c5c5c4e50d3bd1fd7d10117b0 Mon Sep 17 00:00:00 2001 From: akallabeth Date: Wed, 27 Apr 2022 23:26:28 +0200 Subject: [PATCH] Fixed warnings --- channels/cliprdr/server/cliprdr_main.c | 1 - channels/parallel/client/parallel_main.c | 1 - channels/printer/client/printer_main.c | 1 - channels/rail/server/rail_main.c | 3 --- channels/rdpei/client/rdpei_main.c | 1 - channels/urbdrc/client/libusb/libusb_udevice.c | 2 -- client/X11/xf_input.c | 3 ++- client/common/client.c | 2 -- libfreerdp/core/gateway/rdg.c | 2 -- libfreerdp/crypto/ber.c | 4 ---- libfreerdp/crypto/er.c | 4 ---- winpr/libwinpr/crt/alignment.c | 6 +++--- winpr/libwinpr/ncrypt/ncrypt_pkcs11.c | 3 +++ winpr/libwinpr/path/test/TestPathIsUNCEx.c | 8 ++++---- winpr/libwinpr/pipe/pipe.c | 9 --------- winpr/libwinpr/sspi/Kerberos/kerberos.c | 2 ++ winpr/libwinpr/sspi/NTLM/ntlm.c | 4 ++-- winpr/libwinpr/sspi/NTLM/ntlm_message.c | 4 ++-- winpr/libwinpr/thread/thread.c | 7 +++---- 19 files changed, 21 insertions(+), 46 deletions(-) diff --git a/channels/cliprdr/server/cliprdr_main.c b/channels/cliprdr/server/cliprdr_main.c index eb63c2f0b..ecb21a8a8 100644 --- a/channels/cliprdr/server/cliprdr_main.c +++ b/channels/cliprdr/server/cliprdr_main.c @@ -550,7 +550,6 @@ static UINT cliprdr_server_receive_temporary_directory(CliprdrServerContext* con WCHAR* wszTempDir; CLIPRDR_TEMP_DIRECTORY tempDirectory; CliprdrServerPrivate* cliprdr = (CliprdrServerPrivate*)context->handle; - size_t slength; UINT error = CHANNEL_RC_OK; WINPR_UNUSED(header); diff --git a/channels/parallel/client/parallel_main.c b/channels/parallel/client/parallel_main.c index a0a0fdf91..f8f698c6f 100644 --- a/channels/parallel/client/parallel_main.c +++ b/channels/parallel/client/parallel_main.c @@ -311,7 +311,6 @@ static UINT parallel_process_irp(PARALLEL_DEVICE* parallel, IRP* irp) default: irp->IoStatus = STATUS_NOT_SUPPORTED; return irp->Complete(irp); - break; } return CHANNEL_RC_OK; diff --git a/channels/printer/client/printer_main.c b/channels/printer/client/printer_main.c index 8f3cb77ba..7bee639f4 100644 --- a/channels/printer/client/printer_main.c +++ b/channels/printer/client/printer_main.c @@ -575,7 +575,6 @@ static UINT printer_process_irp(PRINTER_DEVICE* printer_dev, IRP* irp) default: irp->IoStatus = STATUS_NOT_SUPPORTED; return irp->Complete(irp); - break; } return CHANNEL_RC_OK; diff --git a/channels/rail/server/rail_main.c b/channels/rail/server/rail_main.c index 6dec0b85a..65e395486 100644 --- a/channels/rail/server/rail_main.c +++ b/channels/rail/server/rail_main.c @@ -1680,7 +1680,4 @@ UINT rail_server_handle_messages(RailServerContext* context) WLog_ERR(TAG, "Unknown RAIL PDU order received."); return ERROR_INVALID_DATA; } - - Stream_SetPosition(s, 0); - return status; } diff --git a/channels/rdpei/client/rdpei_main.c b/channels/rdpei/client/rdpei_main.c index 36c1c6027..c9fddd82c 100644 --- a/channels/rdpei/client/rdpei_main.c +++ b/channels/rdpei/client/rdpei_main.c @@ -716,7 +716,6 @@ static UINT rdpei_send_touch_event_pdu(RDPEI_CHANNEL_CALLBACK* callback, static UINT rdpei_recv_sc_ready_pdu(RDPEI_CHANNEL_CALLBACK* callback, wStream* s) { UINT32 features = 0; - UINT32 size; UINT32 protocolVersion; RDPEI_PLUGIN* rdpei; diff --git a/channels/urbdrc/client/libusb/libusb_udevice.c b/channels/urbdrc/client/libusb/libusb_udevice.c index 72c915023..a204b7885 100644 --- a/channels/urbdrc/client/libusb/libusb_udevice.c +++ b/channels/urbdrc/client/libusb/libusb_udevice.c @@ -1011,8 +1011,6 @@ static int libusb_udev_query_device_descriptor(IUDEVICE* idev, int offset) default: return 0; } - - return 0; } static BOOL libusb_udev_detach_kernel_driver(IUDEVICE* idev) diff --git a/client/X11/xf_input.c b/client/X11/xf_input.c index fc817c477..2dc302ac9 100644 --- a/client/X11/xf_input.c +++ b/client/X11/xf_input.c @@ -758,6 +758,7 @@ int xf_input_handle_event(xfContext* xfc, const XEvent* event) return xf_input_handle_event_local(xfc, event); } -#endif +#else return 0; +#endif } diff --git a/client/common/client.c b/client/common/client.c index b4989a7cf..bc614bccf 100644 --- a/client/common/client.c +++ b/client/common/client.c @@ -578,8 +578,6 @@ static DWORD client_cli_accept_certificate(rdpSettings* settings) printf("\n"); } - - return 0; } /** Callback set in the rdp_freerdp structure, and used to make a certificate validation diff --git a/libfreerdp/core/gateway/rdg.c b/libfreerdp/core/gateway/rdg.c index 973361874..2ea7b1d41 100644 --- a/libfreerdp/core/gateway/rdg.c +++ b/libfreerdp/core/gateway/rdg.c @@ -762,7 +762,6 @@ static int rdg_websocket_read(BIO* bio, BYTE* pBuffer, size_t size, } } /* should be unreachable */ - return -1; } static int rdg_chuncked_read(BIO* bio, BYTE* pBuffer, size_t size, @@ -863,7 +862,6 @@ static int rdg_chuncked_read(BIO* bio, BYTE* pBuffer, size_t size, return -1; } } - return -1; } static int rdg_socket_read(BIO* bio, BYTE* pBuffer, size_t size, diff --git a/libfreerdp/crypto/ber.c b/libfreerdp/crypto/ber.c index 6382cad32..1f7d1af3a 100644 --- a/libfreerdp/crypto/ber.c +++ b/libfreerdp/crypto/ber.c @@ -671,8 +671,6 @@ size_t ber_write_integer(wStream* s, UINT32 value) Stream_Write_UINT32_BE(s, value); return 6; } - - return 0; } size_t ber_write_contextual_integer(wStream* s, BYTE tag, UINT32 value) @@ -711,8 +709,6 @@ size_t ber_sizeof_integer(UINT32 value) /* treat as signed integer i.e. NT/HRESULT error codes */ return 6; } - - return 0; } size_t ber_sizeof_contextual_integer(UINT32 value) diff --git a/libfreerdp/crypto/er.c b/libfreerdp/crypto/er.c index 9a9de89c0..dfa9ffae3 100644 --- a/libfreerdp/crypto/er.c +++ b/libfreerdp/crypto/er.c @@ -419,8 +419,6 @@ int er_write_integer(wStream* s, INT32 value) Stream_Write_UINT32_BE(s, value); return 5; } - - return 0; } int er_skip_integer(INT32 value) @@ -437,8 +435,6 @@ int er_skip_integer(INT32 value) { return _er_skip_length(4) + 5; } - - return 0; } BOOL er_read_integer_length(wStream* s, int* length) diff --git a/winpr/libwinpr/crt/alignment.c b/winpr/libwinpr/crt/alignment.c index 55714bf02..676083e8f 100644 --- a/winpr/libwinpr/crt/alignment.c +++ b/winpr/libwinpr/crt/alignment.c @@ -35,9 +35,9 @@ #include -#ifdef __APPLE__ +#if defined(__APPLE__) #include -#elif __FreeBSD__ || __OpenBSD__ +#elif defined(__FreeBSD__) || defined(__OpenBSD__) #include #else #include @@ -168,7 +168,7 @@ static INLINE size_t cMIN(size_t a, size_t b) void* _aligned_offset_recalloc(void* memblock, size_t num, size_t size, size_t alignment, size_t offset) { - void* newMemblock = NULL; + char* newMemblock = NULL; WINPR_ALIGNED_MEM* pMem = NULL; WINPR_ALIGNED_MEM* pNewMem = NULL; diff --git a/winpr/libwinpr/ncrypt/ncrypt_pkcs11.c b/winpr/libwinpr/ncrypt/ncrypt_pkcs11.c index 7b2a797df..566b3397c 100644 --- a/winpr/libwinpr/ncrypt/ncrypt_pkcs11.c +++ b/winpr/libwinpr/ncrypt/ncrypt_pkcs11.c @@ -16,6 +16,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + +#include + #ifdef WITH_PKCS11 #include diff --git a/winpr/libwinpr/path/test/TestPathIsUNCEx.c b/winpr/libwinpr/path/test/TestPathIsUNCEx.c index 4472ba995..a9cb16474 100644 --- a/winpr/libwinpr/path/test/TestPathIsUNCEx.c +++ b/winpr/libwinpr/path/test/TestPathIsUNCEx.c @@ -12,7 +12,7 @@ static const TCHAR testPathNotUNC[] = _T("C:\\share\\path\\file"); int TestPathIsUNCEx(int argc, char* argv[]) { BOOL status; - LPTSTR Server; + LPCTSTR Server; TCHAR Path[PATHCCH_MAX_CCH]; WINPR_UNUSED(argc); @@ -22,11 +22,11 @@ int TestPathIsUNCEx(int argc, char* argv[]) _tcscpy(Path, testPathUNC); - status = PathIsUNCEx(Path, (LPCTSTR*)&Server); + status = PathIsUNCEx(Path, &Server); if (!status) { - _tprintf(_T("PathIsUNCEx status: 0x%08") _T(PRIX32) _T("\n"), status); + _tprintf(_T("PathIsUNCEx status: 0x%d\n"), status); return -1; } @@ -40,7 +40,7 @@ int TestPathIsUNCEx(int argc, char* argv[]) _tcscpy(Path, testPathNotUNC); - status = PathIsUNCEx(Path, (LPCTSTR*)&Server); + status = PathIsUNCEx(Path, &Server); if (status) { diff --git a/winpr/libwinpr/pipe/pipe.c b/winpr/libwinpr/pipe/pipe.c index 64c437ef0..8fcf81fb8 100644 --- a/winpr/libwinpr/pipe/pipe.c +++ b/winpr/libwinpr/pipe/pipe.c @@ -202,15 +202,6 @@ static HANDLE_OPS ops = { PipeIsHandled, static BOOL NamedPipeIsHandled(HANDLE handle) { return WINPR_HANDLE_IS_HANDLED(handle, HANDLE_TYPE_NAMED_PIPE, TRUE); - WINPR_HANDLE* pPipe = (WINPR_HANDLE*)handle; - - if (!pPipe || (pPipe->Type != HANDLE_TYPE_NAMED_PIPE) || (pPipe == INVALID_HANDLE_VALUE)) - { - SetLastError(ERROR_INVALID_HANDLE); - return FALSE; - } - - return TRUE; } static int NamedPipeGetFd(HANDLE handle) diff --git a/winpr/libwinpr/sspi/Kerberos/kerberos.c b/winpr/libwinpr/sspi/Kerberos/kerberos.c index 22b22afb2..f54c27bd5 100644 --- a/winpr/libwinpr/sspi/Kerberos/kerberos.c +++ b/winpr/libwinpr/sspi/Kerberos/kerberos.c @@ -624,9 +624,11 @@ static SECURITY_STATUS SEC_ENTRY kerberos_InitializeSecurityContextA( PSecBuffer output_buffer = NULL; sspi_gss_buffer_desc input_tok = { 0 }; sspi_gss_buffer_desc output_tok = { 0 }; +#if defined(WITH_GSSAPI) sspi_gss_OID actual_mech; sspi_gss_OID desired_mech = SSPI_GSS_C_SPNEGO_KRB5; UINT32 actual_services; +#endif context = (KRB_CONTEXT*)sspi_SecureHandleGetLowerPointer(phContext); if (!context) diff --git a/winpr/libwinpr/sspi/NTLM/ntlm.c b/winpr/libwinpr/sspi/NTLM/ntlm.c index 062a2b6b0..73c8533ba 100644 --- a/winpr/libwinpr/sspi/NTLM/ntlm.c +++ b/winpr/libwinpr/sspi/NTLM/ntlm.c @@ -466,7 +466,7 @@ ntlm_AcceptSecurityContext(PCredHandle phCredential, PCtxtHandle phContext, PSec return SEC_E_OUT_OF_SEQUENCE; } - break; + case NTLM_STATE_AUTHENTICATE: { if (!pInput) @@ -498,7 +498,7 @@ ntlm_AcceptSecurityContext(PCredHandle phCredential, PCtxtHandle phContext, PSec return status; } - break; + default: break; } diff --git a/winpr/libwinpr/sspi/NTLM/ntlm_message.c b/winpr/libwinpr/sspi/NTLM/ntlm_message.c index 559ec624a..7ed5f5156 100644 --- a/winpr/libwinpr/sspi/NTLM/ntlm_message.c +++ b/winpr/libwinpr/sspi/NTLM/ntlm_message.c @@ -637,8 +637,8 @@ SECURITY_STATUS ntlm_write_NegotiateMessage(NTLM_CONTEXT* context, PSecBuffer bu /* only set if NTLMSSP_NEGOTIATE_DOMAIN_SUPPLIED is set */ /* DomainNameFields (8 bytes) */ - if (!ntlm_write_message_fields(s, &(message->DomainName))) - return SEC_E_INTERNAL_ERROR; + if (!ntlm_write_message_fields(s, &(message->DomainName))) + return SEC_E_INTERNAL_ERROR; /* only set if NTLMSSP_NEGOTIATE_WORKSTATION_SUPPLIED is set */ /* WorkstationFields (8 bytes) */ diff --git a/winpr/libwinpr/thread/thread.c b/winpr/libwinpr/thread/thread.c index f628e612c..75c091f6f 100644 --- a/winpr/libwinpr/thread/thread.c +++ b/winpr/libwinpr/thread/thread.c @@ -307,12 +307,11 @@ static DWORD ThreadCleanupHandle(HANDLE handle) if (!thread->joined) { - int status; - status = pthread_join(thread->thread, NULL); + int rc = pthread_join(thread->thread, NULL); - if (status != 0) + if (rc != 0) { - WLog_ERR(TAG, "pthread_join failure: [%d] %s", status, strerror(status)); + WLog_ERR(TAG, "pthread_join failure: [%d] %s", rc, strerror(rc)); goto fail; } else