From 6284bba9f049284568948cc7a93e147c9e6ab263 Mon Sep 17 00:00:00 2001 From: akallabeth Date: Mon, 11 Aug 2025 13:07:01 +0200 Subject: [PATCH] [clang-tidy] fix various warnings * silence tidy warnings for public API symbols (we can't fix these for compatibility reasons) * fix issues with casting --- client/common/sso_mib_tokens.c | 1 - include/freerdp/crypto/ber.h | 2 ++ include/freerdp/crypto/der.h | 1 + include/freerdp/crypto/er.h | 2 ++ libfreerdp/codec/rfx_differential.h | 6 ++++-- libfreerdp/core/tcp.h | 2 +- winpr/include/winpr/comm.h | 4 ++++ winpr/include/winpr/crt.h | 2 ++ winpr/include/winpr/interlocked.h | 1 + winpr/include/winpr/io.h | 2 ++ winpr/include/winpr/ncrypt.h | 1 + winpr/include/winpr/platform.h | 23 +++++++++++++++++++++++ winpr/include/winpr/smartcard.h | 1 + winpr/include/winpr/spec.h | 12 +++++++++--- winpr/include/winpr/sspi.h | 3 +++ winpr/include/winpr/string.h | 3 +++ winpr/include/winpr/synch.h | 1 + winpr/include/winpr/thread.h | 2 ++ winpr/include/winpr/winsock.h | 5 +++++ winpr/include/winpr/wtsapi.h | 4 ++++ 20 files changed, 71 insertions(+), 7 deletions(-) diff --git a/client/common/sso_mib_tokens.c b/client/common/sso_mib_tokens.c index 11cfb6a47..5c9de081a 100644 --- a/client/common/sso_mib_tokens.c +++ b/client/common/sso_mib_tokens.c @@ -7,7 +7,6 @@ #include #include -#include #include "sso_mib_tokens.h" #include diff --git a/include/freerdp/crypto/ber.h b/include/freerdp/crypto/ber.h index 072517c41..5d4f2f53b 100644 --- a/include/freerdp/crypto/ber.h +++ b/include/freerdp/crypto/ber.h @@ -59,6 +59,8 @@ extern "C" FREERDP_API BOOL ber_read_length(wStream* s, size_t* length); FREERDP_API size_t ber_write_length(wStream* s, size_t length); + + // NOLINTNEXTLINE(bugprone-reserved-identifier,cert-dcl37-c,cert-dcl51-cpp) FREERDP_API size_t _ber_sizeof_length(size_t length); FREERDP_API BOOL ber_read_universal_tag(wStream* s, BYTE tag, BOOL pc); FREERDP_API size_t ber_write_universal_tag(wStream* s, BYTE tag, BOOL pc); diff --git a/include/freerdp/crypto/der.h b/include/freerdp/crypto/der.h index 8ec27f08f..afed4fe7d 100644 --- a/include/freerdp/crypto/der.h +++ b/include/freerdp/crypto/der.h @@ -27,6 +27,7 @@ extern "C" { #endif + // NOLINTNEXTLINE(bugprone-reserved-identifier,cert-dcl37-c,cert-dcl51-cpp) FREERDP_API int _der_skip_length(int length); FREERDP_API int der_write_length(wStream* s, int length); FREERDP_API int der_get_content_length(int length); diff --git a/include/freerdp/crypto/er.h b/include/freerdp/crypto/er.h index d981b4e93..f81d1c1b6 100644 --- a/include/freerdp/crypto/er.h +++ b/include/freerdp/crypto/er.h @@ -62,6 +62,8 @@ extern "C" FREERDP_API void er_read_length(wStream* s, int* length); FREERDP_API int er_write_length(wStream* s, int length, BOOL flag); + + // NOLINTNEXTLINE(bugprone-reserved-identifier,cert-dcl37-c,cert-dcl51-cpp) FREERDP_API int _er_skip_length(int length); FREERDP_API int er_get_content_length(int length); FREERDP_API BOOL er_read_universal_tag(wStream* s, BYTE tag, BOOL pc); diff --git a/libfreerdp/codec/rfx_differential.h b/libfreerdp/codec/rfx_differential.h index 75d96c327..23d3ad406 100644 --- a/libfreerdp/codec/rfx_differential.h +++ b/libfreerdp/codec/rfx_differential.h @@ -30,7 +30,8 @@ static INLINE void rfx_differential_decode(INT16* WINPR_RESTRICT buffer, size_t while (ptr != end) { - ptr[1] += ptr[0]; + const int tmp = ptr[0] + ptr[1]; + ptr[1] = WINPR_ASSERTING_INT_CAST(INT16, tmp); ptr++; } } @@ -42,7 +43,8 @@ static INLINE void rfx_differential_encode(INT16* WINPR_RESTRICT buffer, size_t { INT16* dst = &buffer[x + 1]; const INT16 n2 = *dst; - *dst -= n1; + const int tmp = n2 - n1; + *dst = WINPR_ASSERTING_INT_CAST(INT16, tmp); n1 = n2; } } diff --git a/libfreerdp/core/tcp.h b/libfreerdp/core/tcp.h index 9813694c1..21a0dcf41 100644 --- a/libfreerdp/core/tcp.h +++ b/libfreerdp/core/tcp.h @@ -64,7 +64,7 @@ static INLINE long BIO_get_socket(BIO* b, SOCKET* c) } static INLINE long BIO_get_event(BIO* b, HANDLE* c) { - return BIO_ctrl(b, BIO_C_GET_EVENT, 0, c); + return BIO_ctrl(b, BIO_C_GET_EVENT, 0, (void*)c); } static INLINE long BIO_set_handle(BIO* b, HANDLE h) { diff --git a/winpr/include/winpr/comm.h b/winpr/include/winpr/comm.h index c5532248c..2fd35788f 100644 --- a/winpr/include/winpr/comm.h +++ b/winpr/include/winpr/comm.h @@ -459,16 +459,19 @@ extern "C" { ULONG number; const char* name; + // NOLINTNEXTLINE(bugprone-reserved-identifier,cert-dcl37-c,cert-dcl51-cpp) } _SERIAL_IOCTL_NAME; /** * FIXME: got a proper function name and place */ + // NOLINTNEXTLINE(bugprone-reserved-identifier,cert-dcl37-c,cert-dcl51-cpp) WINPR_API const char* _comm_serial_ioctl_name(ULONG number); /** * FIXME: got a proper function name and place */ + // NOLINTNEXTLINE(bugprone-reserved-identifier,cert-dcl37-c,cert-dcl51-cpp) WINPR_API void _comm_setServerSerialDriver(HANDLE hComm, SERIAL_DRIVER_ID); /** @@ -476,6 +479,7 @@ extern "C" * * permissive mode is disabled by default. */ + // NOLINTNEXTLINE(bugprone-reserved-identifier,cert-dcl37-c,cert-dcl51-cpp) WINPR_API BOOL _comm_set_permissive(HANDLE hDevice, BOOL permissive); /** diff --git a/winpr/include/winpr/crt.h b/winpr/include/winpr/crt.h index 825461580..cf7c48cc9 100644 --- a/winpr/include/winpr/crt.h +++ b/winpr/include/winpr/crt.h @@ -33,6 +33,7 @@ WINPR_PRAGMA_DIAG_PUSH WINPR_PRAGMA_DIAG_IGNORED_RESERVED_IDENTIFIER +// NOLINTBEGIN(bugprone-reserved-identifier,cert-dcl37-c,cert-dcl51-cpp) #ifndef _WIN32 @@ -235,6 +236,7 @@ extern "C" #define winpr_aligned_calloc(count, size, alignment) _aligned_recalloc(NULL, count, size, alignment) #endif /* defined(_WIN32) && (!defined(__MINGW32__) || defined(_UCRT)) */ +// NOLINTEND(bugprone-reserved-identifier,cert-dcl37-c,cert-dcl51-cpp) WINPR_PRAGMA_DIAG_POP #endif /* WINPR_CRT_H */ diff --git a/winpr/include/winpr/interlocked.h b/winpr/include/winpr/interlocked.h index d38b1b571..d78446cc7 100644 --- a/winpr/include/winpr/interlocked.h +++ b/winpr/include/winpr/interlocked.h @@ -82,6 +82,7 @@ extern "C" WINPR_PRAGMA_DIAG_IGNORED_RESERVED_ID_MACRO #define WINPR_SLIST_ENTRY WINPR_SINGLE_LIST_ENTRY +// NOLINTNEXTLINE(bugprone-reserved-identifier,cert-dcl37-c,cert-dcl51-cpp) #define _WINPR_SLIST_ENTRY _WINPR_SINGLE_LIST_ENTRY #define WINPR_PSLIST_ENTRY WINPR_PSINGLE_LIST_ENTRY diff --git a/winpr/include/winpr/io.h b/winpr/include/winpr/io.h index 8976529c0..626b13cb4 100644 --- a/winpr/include/winpr/io.h +++ b/winpr/include/winpr/io.h @@ -198,11 +198,13 @@ extern "C" typedef HANDLE PDRIVER_OBJECT_EX; typedef HANDLE PDEVICE_OBJECT_EX; +// NOLINTNEXTLINE(bugprone-reserved-identifier,cert-dcl37-c,cert-dcl51-cpp) WINPR_API NTSTATUS _IoCreateDeviceEx(PDRIVER_OBJECT_EX DriverObject, ULONG DeviceExtensionSize, PUNICODE_STRING DeviceName, DEVICE_TYPE DeviceType, ULONG DeviceCharacteristics, BOOLEAN Exclusive, PDEVICE_OBJECT_EX* DeviceObject); +// NOLINTNEXTLINE(bugprone-reserved-identifier,cert-dcl37-c,cert-dcl51-cpp) WINPR_API VOID _IoDeleteDeviceEx(PDEVICE_OBJECT_EX DeviceObject); #endif diff --git a/winpr/include/winpr/ncrypt.h b/winpr/include/winpr/ncrypt.h index 022fa9ea3..6b182333c 100644 --- a/winpr/include/winpr/ncrypt.h +++ b/winpr/include/winpr/ncrypt.h @@ -33,6 +33,7 @@ WINPR_PRAGMA_DIAG_IGNORED_RESERVED_ID_MACRO #ifndef __SECSTATUS_DEFINED__ typedef LONG SECURITY_STATUS; +// NOLINTNEXTLINE(bugprone-reserved-identifier,cert-dcl37-c,cert-dcl51-cpp) #define __SECSTATUS_DEFINED__ #endif diff --git a/winpr/include/winpr/platform.h b/winpr/include/winpr/platform.h index be331a044..755ae2b45 100644 --- a/winpr/include/winpr/platform.h +++ b/winpr/include/winpr/platform.h @@ -227,6 +227,7 @@ WINPR_PRAGMA_DIAG_IGNORED_RESERVED_ID_MACRO #if defined(__amd64) || defined(__amd64__) || defined(__x86_64) || defined(__x86_64__) || \ defined(_M_X64) #ifndef _M_AMD64 +// NOLINTNEXTLINE(bugprone-reserved-identifier,cert-dcl37-c,cert-dcl51-cpp) #define _M_AMD64 1 #endif #endif @@ -234,6 +235,7 @@ WINPR_PRAGMA_DIAG_IGNORED_RESERVED_ID_MACRO /* Intel ia64 */ #if defined(__ia64) || defined(__ia64__) || defined(_M_IA64) #ifndef _M_IA64 +// NOLINTNEXTLINE(bugprone-reserved-identifier,cert-dcl37-c,cert-dcl51-cpp) #define _M_IA64 1 #endif #endif @@ -242,6 +244,7 @@ WINPR_PRAGMA_DIAG_IGNORED_RESERVED_ID_MACRO #if defined(_M_IX86) || defined(_M_AMD64) #ifndef _M_IX86_AMD64 +// NOLINTNEXTLINE(bugprone-reserved-identifier,cert-dcl37-c,cert-dcl51-cpp) #define _M_IX86_AMD64 1 #endif #endif @@ -251,6 +254,7 @@ WINPR_PRAGMA_DIAG_IGNORED_RESERVED_ID_MACRO #if defined(__arm__) || defined(__thumb__) || defined(__TARGET_ARCH_ARM) || \ defined(__TARGET_ARCH_THUMB) #ifndef _M_ARM +// NOLINTNEXTLINE(bugprone-reserved-identifier,cert-dcl37-c,cert-dcl51-cpp) #define _M_ARM 1 #endif #endif @@ -267,6 +271,7 @@ WINPR_PRAGMA_DIAG_IGNORED_RESERVED_ID_MACRO #if defined(mips) || defined(__mips) || defined(__mips__) || defined(__MIPS__) #ifndef _M_MIPS +// NOLINTNEXTLINE(bugprone-reserved-identifier,cert-dcl37-c,cert-dcl51-cpp) #define _M_MIPS 1 #endif #endif @@ -275,6 +280,7 @@ WINPR_PRAGMA_DIAG_IGNORED_RESERVED_ID_MACRO #if defined(mips64) || defined(__mips64) || defined(__mips64__) || defined(__MIPS64__) #ifndef _M_MIPS64 +// NOLINTNEXTLINE(bugprone-reserved-identifier,cert-dcl37-c,cert-dcl51-cpp) #define _M_MIPS64 1 #endif #endif @@ -284,6 +290,7 @@ WINPR_PRAGMA_DIAG_IGNORED_RESERVED_ID_MACRO #if defined(__ppc__) || defined(__powerpc) || defined(__powerpc__) || defined(__POWERPC__) || \ defined(_ARCH_PPC) #ifndef _M_PPC +// NOLINTNEXTLINE(bugprone-reserved-identifier,cert-dcl37-c,cert-dcl51-cpp) #define _M_PPC 1 #endif #endif @@ -292,6 +299,7 @@ WINPR_PRAGMA_DIAG_IGNORED_RESERVED_ID_MACRO #if defined(__ia64) || defined(__ia64__) || defined(_IA64) || defined(__IA64__) #ifndef _M_IA64 +// NOLINTNEXTLINE(bugprone-reserved-identifier,cert-dcl37-c,cert-dcl51-cpp) #define _M_IA64 1 #endif #endif @@ -300,6 +308,7 @@ WINPR_PRAGMA_DIAG_IGNORED_RESERVED_ID_MACRO #if defined(__alpha) || defined(__alpha__) #ifndef _M_ALPHA +// NOLINTNEXTLINE(bugprone-reserved-identifier,cert-dcl37-c,cert-dcl51-cpp) #define _M_ALPHA 1 #endif #endif @@ -308,6 +317,7 @@ WINPR_PRAGMA_DIAG_IGNORED_RESERVED_ID_MACRO #if defined(__sparc) || defined(__sparc__) #ifndef _M_SPARC +// NOLINTNEXTLINE(bugprone-reserved-identifier,cert-dcl37-c,cert-dcl51-cpp) #define _M_SPARC 1 #endif #endif @@ -316,6 +326,7 @@ WINPR_PRAGMA_DIAG_IGNORED_RESERVED_ID_MACRO #if defined(__e2k__) #ifndef _M_E2K +// NOLINTNEXTLINE(bugprone-reserved-identifier,cert-dcl37-c,cert-dcl51-cpp) #define _M_E2K 1 #endif #endif @@ -332,6 +343,7 @@ WINPR_PRAGMA_DIAG_IGNORED_RESERVED_ID_MACRO #if defined(WINAPI_FAMILY) #if (WINAPI_FAMILY == WINAPI_FAMILY_APP) #ifndef _WINRT +// NOLINTNEXTLINE(bugprone-reserved-identifier,cert-dcl37-c,cert-dcl51-cpp) #define _WINRT 1 #endif #endif @@ -339,6 +351,7 @@ WINPR_PRAGMA_DIAG_IGNORED_RESERVED_ID_MACRO #if defined(__cplusplus_winrt) #ifndef _WINRT +// NOLINTNEXTLINE(bugprone-reserved-identifier,cert-dcl37-c,cert-dcl51-cpp) #define _WINRT 1 #endif #endif @@ -364,6 +377,7 @@ WINPR_PRAGMA_DIAG_IGNORED_RESERVED_ID_MACRO /* iOS (__IOS__) */ #ifndef __IOS__ +// NOLINTNEXTLINE(bugprone-reserved-identifier,cert-dcl37-c,cert-dcl51-cpp) #define __IOS__ 1 #endif @@ -372,6 +386,7 @@ WINPR_PRAGMA_DIAG_IGNORED_RESERVED_ID_MACRO /* Mac OS X (__MACOSX__) */ #ifndef __MACOSX__ +// NOLINTNEXTLINE(bugprone-reserved-identifier,cert-dcl37-c,cert-dcl51-cpp) #define __MACOSX__ 1 #endif @@ -394,6 +409,7 @@ WINPR_PRAGMA_DIAG_IGNORED_RESERVED_ID_MACRO #if defined(sun) #ifndef __sun +// NOLINTNEXTLINE(bugprone-reserved-identifier,cert-dcl37-c,cert-dcl51-cpp) #define __sun 1 #endif #endif @@ -402,6 +418,7 @@ WINPR_PRAGMA_DIAG_IGNORED_RESERVED_ID_MACRO #if defined(sgi) #ifndef __sgi +// NOLINTNEXTLINE(bugprone-reserved-identifier,cert-dcl37-c,cert-dcl51-cpp) #define __sgi 1 #endif #endif @@ -410,6 +427,7 @@ WINPR_PRAGMA_DIAG_IGNORED_RESERVED_ID_MACRO #if defined(__TOS_AIX__) #ifndef _AIX +// NOLINTNEXTLINE(bugprone-reserved-identifier,cert-dcl37-c,cert-dcl51-cpp) #define _AIX 1 #endif #endif @@ -418,6 +436,7 @@ WINPR_PRAGMA_DIAG_IGNORED_RESERVED_ID_MACRO #if defined(hpux) || defined(_hpux) #ifndef __hpux +// NOLINTNEXTLINE(bugprone-reserved-identifier,cert-dcl37-c,cert-dcl51-cpp) #define __hpux 1 #endif #endif @@ -446,6 +465,7 @@ WINPR_PRAGMA_DIAG_IGNORED_RESERVED_ID_MACRO #if (__BYTE_ORDER == __BIG_ENDIAN) #ifndef __BIG_ENDIAN__ +// NOLINTNEXTLINE(bugprone-reserved-identifier,cert-dcl37-c,cert-dcl51-cpp) #define __BIG_ENDIAN__ 1 #endif #endif @@ -455,6 +475,7 @@ WINPR_PRAGMA_DIAG_IGNORED_RESERVED_ID_MACRO #if defined(__ARMEB__) || defined(__THUMBEB__) || defined(__AARCH64EB__) || defined(_MIPSEB) || \ defined(__MIPSEB) || defined(__MIPSEB__) #ifndef __BIG_ENDIAN__ +// NOLINTNEXTLINE(bugprone-reserved-identifier,cert-dcl37-c,cert-dcl51-cpp) #define __BIG_ENDIAN__ 1 #endif #endif @@ -467,6 +488,7 @@ WINPR_PRAGMA_DIAG_IGNORED_RESERVED_ID_MACRO #if (__BYTE_ORDER == __LITTLE_ENDIAN) #ifndef __LITTLE_ENDIAN__ +// NOLINTNEXTLINE(bugprone-reserved-identifier,cert-dcl37-c,cert-dcl51-cpp) #define __LITTLE_ENDIAN__ 1 #endif #endif @@ -476,6 +498,7 @@ WINPR_PRAGMA_DIAG_IGNORED_RESERVED_ID_MACRO #if defined(__ARMEL__) || defined(__THUMBEL__) || defined(__AARCH64EL__) || defined(_MIPSEL) || \ defined(__MIPSEL) || defined(__MIPSEL__) || defined(__e2k__) #ifndef __LITTLE_ENDIAN__ +// NOLINTNEXTLINE(bugprone-reserved-identifier,cert-dcl37-c,cert-dcl51-cpp) #define __LITTLE_ENDIAN__ 1 #endif #endif diff --git a/winpr/include/winpr/smartcard.h b/winpr/include/winpr/smartcard.h index 23eac318b..ac845caee 100644 --- a/winpr/include/winpr/smartcard.h +++ b/winpr/include/winpr/smartcard.h @@ -33,6 +33,7 @@ WINPR_PRAGMA_DIAG_PUSH WINPR_PRAGMA_DIAG_IGNORED_RESERVED_ID_MACRO #ifndef _WINSCARD_H_ +// NOLINTNEXTLINE(bugprone-reserved-identifier,cert-dcl37-c,cert-dcl51-cpp) #define _WINSCARD_H_ /* do not include winscard.h */ #endif diff --git a/winpr/include/winpr/spec.h b/winpr/include/winpr/spec.h index b37f2c948..cd56031e6 100644 --- a/winpr/include/winpr/spec.h +++ b/winpr/include/winpr/spec.h @@ -72,6 +72,7 @@ WINPR_PRAGMA_DIAG_IGNORED_RESERVED_IDENTIFIER #endif #if (defined(_M_AMD64) || defined(_M_ARM)) && !defined(_WIN32) +// NOLINTNEXTLINE(bugprone-reserved-identifier,cert-dcl37-c,cert-dcl51-cpp) #define _UNALIGNED __unaligned #else #define _UNALIGNED @@ -95,6 +96,7 @@ WINPR_PRAGMA_DIAG_IGNORED_RESERVED_IDENTIFIER #ifdef __GNUC__ #ifndef __declspec +// NOLINTNEXTLINE(bugprone-reserved-identifier,cert-dcl37-c,cert-dcl51-cpp) #define __declspec(e) __attribute__((e)) #endif #endif @@ -112,6 +114,7 @@ WINPR_PRAGMA_DIAG_IGNORED_RESERVED_IDENTIFIER * http://msdn.microsoft.com/en-us/library/windows/desktop/aa383701/ */ +// NOLINTBEGIN(bugprone-reserved-identifier,cert-dcl37-c,cert-dcl51-cpp) #define __field_bcount(size) __notnull __byte_writableTo(size) #define __field_ecount(size) __notnull __elem_writableTo(size) #define __post_invalid _Post_ __notvalid @@ -855,7 +858,7 @@ WINPR_PRAGMA_DIAG_IGNORED_RESERVED_IDENTIFIER #define __deref_out_opt #define __ecount(size) #define __ecount_opt(size) -//#define __in /* Conflicts with libstdc++ header macros */ +// #define __in /* Conflicts with libstdc++ header macros */ #define __in_bcount(size) #define __in_bcount_opt(size) #define __in_ecount(size) @@ -875,7 +878,7 @@ WINPR_PRAGMA_DIAG_IGNORED_RESERVED_IDENTIFIER #define __inout_ecount_part(size, length) #define __inout_ecount_part_opt(size, length) #define __inout_opt -//#define __out /* Conflicts with libstdc++ header macros */ +// #define __out /* Conflicts with libstdc++ header macros */ #define __out_bcount(size) #define __out_bcount_full(size) #define __out_bcount_full_opt(size) @@ -899,10 +902,12 @@ WINPR_PRAGMA_DIAG_IGNORED_RESERVED_IDENTIFIER #define __nullterminated #define __out_awcount(expr, size) #define __override -//#define __reserved /* Conflicts with header included by CarbonCore.h on OS X */ +// #define __reserved /* Conflicts with header included by CarbonCore.h on OS X */ #define __success(expr) #define __typefix(ctype) +// NOLINTEND(bugprone-reserved-identifier,cert-dcl37-c,cert-dcl51-cpp) + #ifndef _countof #ifndef __cplusplus #define _countof(_Array) (sizeof(_Array) / sizeof(_Array[0])) @@ -953,6 +958,7 @@ extern "C++" #define RTL_NUMBER_OF(A) RTL_NUMBER_OF_V1(A) #define ARRAYSIZE(A) RTL_NUMBER_OF_V2(A) +// NOLINTNEXTLINE(bugprone-reserved-identifier,cert-dcl37-c,cert-dcl51-cpp) #define _ARRAYSIZE(A) RTL_NUMBER_OF_V1(A) #define RTL_FIELD_TYPE(type, field) (((type*)0)->field) diff --git a/winpr/include/winpr/sspi.h b/winpr/include/winpr/sspi.h index 6150472ed..1b325de2b 100644 --- a/winpr/include/winpr/sspi.h +++ b/winpr/include/winpr/sspi.h @@ -61,6 +61,7 @@ WINPR_PRAGMA_DIAG_IGNORED_RESERVED_ID_MACRO #ifndef __SECSTATUS_DEFINED__ typedef LONG SECURITY_STATUS; +// NOLINTNEXTLINE(bugprone-reserved-identifier,cert-dcl37-c,cert-dcl51-cpp) #define __SECSTATUS_DEFINED__ #endif /* __SECSTATUS_DEFINED__ */ @@ -671,6 +672,7 @@ WINPR_PRAGMA_DIAG_PUSH WINPR_PRAGMA_DIAG_IGNORED_RESERVED_ID_MACRO #ifndef _AUTH_IDENTITY_DEFINED +// NOLINTNEXTLINE(bugprone-reserved-identifier,cert-dcl37-c,cert-dcl51-cpp) #define _AUTH_IDENTITY_DEFINED typedef struct @@ -772,6 +774,7 @@ typedef struct #endif /* SEC_WINNT_AUTH_IDENTITY_VERSION_2 */ #ifndef _AUTH_IDENTITY_INFO_DEFINED +// NOLINTNEXTLINE(bugprone-reserved-identifier,cert-dcl37-c,cert-dcl51-cpp) #define _AUTH_IDENTITY_INFO_DEFINED // https://docs.microsoft.com/en-us/windows/win32/api/sspi/ns-sspi-sec_winnt_auth_identity_info diff --git a/winpr/include/winpr/string.h b/winpr/include/winpr/string.h index 52a9e1f4e..3d3659e63 100644 --- a/winpr/include/winpr/string.h +++ b/winpr/include/winpr/string.h @@ -30,6 +30,7 @@ WINPR_PRAGMA_DIAG_PUSH WINPR_PRAGMA_DIAG_IGNORED_RESERVED_IDENTIFIER +// NOLINTBEGIN(bugprone-reserved-identifier,cert-dcl37-c,cert-dcl51-cpp) #ifdef __cplusplus extern "C" @@ -85,6 +86,7 @@ extern "C" WINPR_API WCHAR* wcstok_s(WCHAR* strToken, const WCHAR* strDelimit, WCHAR** context); WINPR_API WCHAR* _wcsncat(WCHAR* dst, const WCHAR* src, size_t sz); + #else #define _wcscmp wcscmp @@ -450,6 +452,7 @@ extern "C" } #endif +// NOLINTEND(bugprone-reserved-identifier,cert-dcl37-c,cert-dcl51-cpp) WINPR_PRAGMA_DIAG_POP #endif /* WINPR_CRT_STRING_H */ diff --git a/winpr/include/winpr/synch.h b/winpr/include/winpr/synch.h index eb6289522..ea01c5339 100644 --- a/winpr/include/winpr/synch.h +++ b/winpr/include/winpr/synch.h @@ -339,6 +339,7 @@ extern "C" WINPR_PRAGMA_DIAG_IGNORED_RESERVED_ID_MACRO #ifndef _RTL_RUN_ONCE_DEF +// NOLINTNEXTLINE(bugprone-reserved-identifier,cert-dcl37-c,cert-dcl51-cpp) #define _RTL_RUN_ONCE_DEF WINPR_PRAGMA_DIAG_POP diff --git a/winpr/include/winpr/thread.h b/winpr/include/winpr/thread.h index 5a9b77cc0..debe7b948 100644 --- a/winpr/include/winpr/thread.h +++ b/winpr/include/winpr/thread.h @@ -181,6 +181,7 @@ extern "C" WINPR_PRAGMA_DIAG_PUSH WINPR_PRAGMA_DIAG_IGNORED_RESERVED_IDENTIFIER + // NOLINTNEXTLINE(bugprone-reserved-identifier,cert-dcl37-c,cert-dcl51-cpp) WINPR_API HANDLE _GetCurrentProcess(void); WINPR_PRAGMA_DIAG_POP @@ -246,6 +247,7 @@ extern "C" WINPR_PRAGMA_DIAG_PUSH WINPR_PRAGMA_DIAG_IGNORED_RESERVED_IDENTIFIER + // NOLINTNEXTLINE(bugprone-reserved-identifier,cert-dcl37-c,cert-dcl51-cpp) WINPR_API HANDLE _GetCurrentThread(void); WINPR_PRAGMA_DIAG_POP diff --git a/winpr/include/winpr/winsock.h b/winpr/include/winpr/winsock.h index 24db06fac..d9c42a66f 100644 --- a/winpr/include/winpr/winsock.h +++ b/winpr/include/winpr/winsock.h @@ -192,11 +192,13 @@ typedef union sockaddr_gen WINPR_PRAGMA_DIAG_PUSH WINPR_PRAGMA_DIAG_IGNORED_RESERVED_ID_MACRO +// NOLINTBEGIN(bugprone-reserved-identifier,cert-dcl37-c,cert-dcl51-cpp) #define _IFF_UP 0x00000001 #define _IFF_BROADCAST 0x00000002 #define _IFF_LOOPBACK 0x00000004 #define _IFF_POINTTOPOINT 0x00000008 #define _IFF_MULTICAST 0x00000010 +// NOLINTEND(bugprone-reserved-identifier,cert-dcl37-c,cert-dcl51-cpp) WINPR_PRAGMA_DIAG_POP @@ -322,6 +324,7 @@ extern "C" LPWSAOVERLAPPED lpOverlapped, LPWSAOVERLAPPED_COMPLETION_ROUTINE lpCompletionRoutine); + // NOLINTBEGIN(bugprone-reserved-identifier,cert-dcl37-c,cert-dcl51-cpp) WINPR_API SOCKET _accept(SOCKET s, struct sockaddr* addr, int* addrlen); WINPR_API int _bind(SOCKET s, const struct sockaddr* addr, int namelen); WINPR_API int closesocket(SOCKET s); @@ -358,6 +361,8 @@ extern "C" WINPR_API struct protoent* _getprotobynumber(int number); WINPR_API struct protoent* _getprotobyname(const char* name); + // NOLINTEND(bugprone-reserved-identifier,cert-dcl37-c,cert-dcl51-cpp) + #ifdef __cplusplus } #endif diff --git a/winpr/include/winpr/wtsapi.h b/winpr/include/winpr/wtsapi.h index 6bb64fc6c..6794bb020 100644 --- a/winpr/include/winpr/wtsapi.h +++ b/winpr/include/winpr/wtsapi.h @@ -485,6 +485,7 @@ typedef struct LARGE_INTEGER DisconnectTime; LARGE_INTEGER LastInputTime; LARGE_INTEGER LogonTime; + // NOLINTNEXTLINE(bugprone-reserved-identifier,cert-dcl37-c,cert-dcl51-cpp) LARGE_INTEGER _CurrentTime; /* Conflicts with X11 headers */ } WTSINFOW, *PWTSINFOW; @@ -505,6 +506,7 @@ typedef struct LARGE_INTEGER DisconnectTime; LARGE_INTEGER LastInputTime; LARGE_INTEGER LogonTime; + // NOLINTNEXTLINE(bugprone-reserved-identifier,cert-dcl37-c,cert-dcl51-cpp) LARGE_INTEGER _CurrentTime; /* Conflicts with X11 headers */ } WTSINFOA, *PWTSINFOA; @@ -524,6 +526,7 @@ typedef struct LARGE_INTEGER ConnectTime; LARGE_INTEGER DisconnectTime; LARGE_INTEGER LastInputTime; + // NOLINTNEXTLINE(bugprone-reserved-identifier,cert-dcl37-c,cert-dcl51-cpp) LARGE_INTEGER _CurrentTime; /* Conflicts with X11 headers */ DWORD IncomingBytes; DWORD OutgoingBytes; @@ -545,6 +548,7 @@ typedef struct LARGE_INTEGER ConnectTime; LARGE_INTEGER DisconnectTime; LARGE_INTEGER LastInputTime; + // NOLINTNEXTLINE(bugprone-reserved-identifier,cert-dcl37-c,cert-dcl51-cpp) LARGE_INTEGER _CurrentTime; /* Conflicts with X11 headers */ DWORD IncomingBytes; DWORD OutgoingBytes;