niansa-misc/wine
1
0
Fork 0
mirror of synced 2025-03-07 03:53:26 +01:00
Code Issues Projects Releases Packages Wiki Activity

include/msvcrt: Add noreturn attribute to _assert.

Browse source 
This informs the compiler that no code following an assertion failure
will execute (unless NDEBUG is defined), which increases the accuracy of
compiler warnings and static analyses.

For assert.h, put DECLSPEC_NORETURN before the return type in the
function declaration to remain consistent with other MSVCRT function
declarations.
This commit is contained in:
Jinoh Kang 2023-01-28 08:21:19 +09:00 • committed by Alexandre Julliard
parent 36575a2e7a
commit b6a26817bc
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
dlls/msvcrt/exit.c
View file

@ -290,7 +290,7 @@ unsigned int CDECL _set_abort_behavior(unsigned int flags, unsigned int mask)
/*********************************************************************
* _wassert (MSVCRT.@)
*/
void CDECL _wassert(const wchar_t* str, const wchar_t* file, unsigned int line)
void DECLSPEC_NORETURN CDECL _wassert(const wchar_t* str, const wchar_t* file, unsigned int line)
{
TRACE("(%s,%s,%d)\n", debugstr_w(str), debugstr_w(file), line);
@ -311,7 +311,7 @@ void CDECL _wassert(const wchar_t* str, const wchar_t* file, unsigned int line)
/*********************************************************************
* _assert (MSVCRT.@)
*/
void CDECL _assert(const char* str, const char* file, unsigned int line)
void DECLSPEC_NORETURN CDECL _assert(const char* str, const char* file, unsigned int line)
{
wchar_t strW[1024], fileW[1024];

2
dlls/ntdll/exception.c
View file

@ -623,7 +623,7 @@ PRUNTIME_FUNCTION WINAPI RtlLookupFunctionEntry( ULONG_PTR pc, ULONG_PTR *base,
/*************************************************************
* _assert
*/
void __cdecl _assert( const char *str, const char *file, unsigned int line )
void DECLSPEC_NORETURN __cdecl _assert( const char *str, const char *file, unsigned int line )
{
ERR( "%s:%u: Assertion failed %s\n", file, line, debugstr_a(str) );
RtlRaiseStatus( EXCEPTION_WINE_ASSERTION );

2
include/msvcrt/assert.h
View file

@ -28,7 +28,7 @@ extern "C" {
#ifdef NDEBUG
#define assert(_expr) ((void)0)
#else
_ACRTIMP void __cdecl _assert(const char *, const char *, unsigned int);
_ACRTIMP DECLSPEC_NORETURN void __cdecl _assert(const char *, const char *, unsigned int);
#define assert(_expr) (void)((!!(_expr)) || (_assert(#_expr, __FILE__, __LINE__), 0))
#endif