Skip to content

Commit

Permalink
Fix last "noreturn" warnings
Browse files Browse the repository at this point in the history
  • Loading branch information
Thilo Schulz committed Jul 27, 2011
1 parent b6a4aa3 commit 62757b2
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 7 deletions.
4 changes: 2 additions & 2 deletions code/game/g_local.h
Expand Up @@ -627,7 +627,7 @@ void AddTournamentQueue(gclient_t *client);
void QDECL G_LogPrintf( const char *fmt, ... ) __attribute__ ((format (printf, 1, 2)));
void SendScoreboardMessageToAllClients( void );
void QDECL G_Printf( const char *fmt, ... ) __attribute__ ((format (printf, 1, 2)));
void QDECL G_Error( const char *fmt, ... ) __attribute__ ((format (printf, 1, 2)));
void QDECL G_Error( const char *fmt, ... ) __attribute__ ((noreturn, format (printf, 1, 2)));

//
// g_client.c
Expand Down Expand Up @@ -767,7 +767,7 @@ extern vmCvar_t g_singlePlayer;
extern vmCvar_t g_proxMineTimeout;

void trap_Printf( const char *fmt );
void trap_Error( const char *fmt );
void trap_Error(const char *fmt) __attribute__((noreturn));
int trap_Milliseconds( void );
int trap_RealTime( qtime_t *qtime );
int trap_Argc( void );
Expand Down
6 changes: 4 additions & 2 deletions code/game/g_syscalls.c
Expand Up @@ -45,8 +45,10 @@ void trap_Printf( const char *fmt ) {
syscall( G_PRINT, fmt );
}

void trap_Error( const char *fmt ) {
syscall( G_ERROR, fmt );
void trap_Error(const char *fmt)
{
syscall(G_ERROR, fmt);
exit(1);
}

int trap_Milliseconds( void ) {
Expand Down
2 changes: 1 addition & 1 deletion code/ui/ui_local.h
Expand Up @@ -915,7 +915,7 @@ void UI_SPSkillMenu_Cache( void );
// ui_syscalls.c
//
void trap_Print( const char *string );
void trap_Error( const char *string );
void trap_Error(const char *string) __attribute__((noreturn));
int trap_Milliseconds( void );
void trap_Cvar_Register( vmCvar_t *vmCvar, const char *varName, const char *defaultValue, int flags );
void trap_Cvar_Update( vmCvar_t *vmCvar );
Expand Down
6 changes: 4 additions & 2 deletions code/ui/ui_syscalls.c
Expand Up @@ -44,8 +44,10 @@ void trap_Print( const char *string ) {
syscall( UI_PRINT, string );
}

void trap_Error( const char *string ) {
syscall( UI_ERROR, string );
void trap_Error(const char *string)
{
syscall(UI_ERROR, string);
exit(1);
}

int trap_Milliseconds( void ) {
Expand Down

0 comments on commit 62757b2

Please sign in to comment.