From 86a777880f2199782aacc88a8b9bbb067106584c Mon Sep 17 00:00:00 2001 From: Alibek Omarov Date: Sun, 29 May 2022 01:58:56 +0300 Subject: [PATCH] engine: common: mark AbortCurrentFrame as NORETURN, fix noreturn warnings --- engine/common/common.h | 2 +- engine/common/host.c | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/engine/common/common.h b/engine/common/common.h index b60dcf34..333f31aa 100644 --- a/engine/common/common.h +++ b/engine/common/common.h @@ -691,7 +691,7 @@ int EXPORT Host_Main( int argc, char **argv, const char *progname, int bChangeGa int Host_CompareFileTime( int ft1, int ft2 ); void Host_NewInstance( const char *name, const char *finalmsg ); void Host_EndGame( qboolean abort, const char *message, ... ) _format( 2 ); -void Host_AbortCurrentFrame( void ); +void Host_AbortCurrentFrame( void ) NORETURN; void Host_WriteServerConfig( const char *name ); void Host_WriteOpenGLConfig( void ); void Host_WriteVideoConfig( void ); diff --git a/engine/common/host.c b/engine/common/host.c index 9b0c6285..d3ca35b8 100644 --- a/engine/common/host.c +++ b/engine/common/host.c @@ -721,7 +721,6 @@ void GAME_EXPORT Host_Error( const char *error, ... ) else if( host.framecount == host.errorframe ) { Sys_Error( "Host_MultiError: %s", hosterror2 ); - return; } else { @@ -741,7 +740,6 @@ void GAME_EXPORT Host_Error( const char *error, ... ) { Con_Printf( "Host_RecursiveError: %s", hosterror2 ); Sys_Error( "%s", hosterror1 ); - return; // don't multiple executes } recursive = true;