[openjk] 13/19: Fix some compiler warnings (#917)
Simon McVittie
smcv at debian.org
Sat Aug 5 10:52:49 UTC 2017
This is an automated email from the git hooks/post-receive script.
smcv pushed a commit to branch debian/master
in repository openjk.
commit 18324bace6d39b884115fdd77e9005af0b59617c
Author: Simon McVittie <smcv at debian.org>
Date: Fri Jul 7 10:34:33 2017 +0100
Fix some compiler warnings (#917)
* Consistently declare Com_Error implementations as noreturn
According to comments in code/game/g_public.h (whose version was
already tagged noreturn), for function pointers this only works with
the gcc/clang-specific spelling __attribute__((noreturn)), and not with
the gcc/clang/MSVC abstraction NORETURN. For function implementations,
we can use NORETURN to get MSVC support too.
This lets the compiler reason about what returns and what doesn't,
and in particular silences gcc warnings about functions that
are declared NORETURN but that did appear to return. They didn't,
because they ended with a call to (a function pointer that
eventually calls) Com_Error, but without these annotations
the compiler couldn't know that.
Signed-off-by: Simon McVittie <smcv at debian.org>
* AI_ClosestGroupEntityNumToPoint: Remove, unused
It issues compiler warnings (or did until recently), and git grep says
nothing actually calls or mentions this function.
Signed-off-by: Simon McVittie <smcv at debian.org>
* Icarus: Squash a compiler warning about possibly uninitialized length
clang can see that BufferRead() does not always assign to length,
issuing this warning:
IcarusImplementation.cpp|601 col 13| warning: ‘length’ may be used uninitialized in this function [-Wmaybe-uninitialized]
(This only happens if the buffer is null, in which case we have
bigger problems.)
Signed-off-by: Simon McVittie <smcv at debian.org>
* Move definition of NORETURN to q_platform.h
Signed-off-by: Simon McVittie <smcv at debian.org>
* Introduce NORETURN_PTR, a version of NORETURN for function pointers
This expands to the same thing as NORETURN on gcc (and clang), but
expands to nothing on MSVC.
Signed-off-by: Simon McVittie <smcv at debian.org>
* Define NORETURN, NORETURN_PTR for non-gcc non-MSVC compilers
Signed-off-by: Simon McVittie <smcv at debian.org>
---
code/cgame/cg_local.h | 4 ++--
code/cgame/cg_main.cpp | 2 +-
code/cgame/cg_syscalls.cpp | 2 +-
code/game/g_public.h | 4 +---
code/icarus/IcarusImplementation.cpp | 2 +-
code/qcommon/q_shared.h | 6 ------
code/rd-common/tr_public.h | 2 +-
code/ui/ui_public.h | 2 +-
codeJK2/cgame/cg_local.h | 4 ++--
codeJK2/cgame/cg_main.cpp | 2 +-
codeJK2/cgame/cg_syscalls.cpp | 2 +-
codeJK2/game/AI_Utils.cpp | 32 --------------------------------
codeJK2/game/g_public.h | 2 +-
codemp/cgame/cg_public.h | 2 +-
codemp/cgame/cg_syscalls.c | 4 ++--
codemp/game/NPC_AI_Utils.c | 33 ---------------------------------
codemp/game/g_public.h | 2 +-
codemp/game/g_syscalls.c | 4 ++--
codemp/qcommon/q_shared.h | 8 +-------
codemp/rd-common/tr_public.h | 2 +-
codemp/ui/ui_public.h | 2 +-
codemp/ui/ui_shared.h | 2 +-
codemp/ui/ui_syscalls.c | 4 ++--
shared/qcommon/q_platform.h | 12 ++++++++++++
24 files changed, 37 insertions(+), 104 deletions(-)
diff --git a/code/cgame/cg_local.h b/code/cgame/cg_local.h
index 19b8f11..aea6040 100644
--- a/code/cgame/cg_local.h
+++ b/code/cgame/cg_local.h
@@ -665,7 +665,7 @@ const char *CG_ConfigString( int index );
const char *CG_Argv( int arg );
void QDECL CG_Printf( const char *msg, ... );
-void QDECL CG_Error( const char *msg, ... );
+NORETURN void QDECL CG_Error( const char *msg, ... );
void CG_StartMusic( qboolean bForceStart );
@@ -921,7 +921,7 @@ qboolean CG_Credits_Draw( void );
void cgi_Printf( const char *fmt );
// abort the game
-void cgi_Error( const char *fmt );
+NORETURN void cgi_Error( const char *fmt );
// milliseconds should only be used for performance tuning, never
// for anything game related. Get time from the CG_DrawActiveFrame parameter
diff --git a/code/cgame/cg_main.cpp b/code/cgame/cg_main.cpp
index eeb2ed5..1b9c161 100644
--- a/code/cgame/cg_main.cpp
+++ b/code/cgame/cg_main.cpp
@@ -570,7 +570,7 @@ void CG_Printf( const char *msg, ... ) {
cgi_Printf( text );
}
-void CG_Error( const char *msg, ... ) {
+NORETURN void CG_Error( const char *msg, ... ) {
va_list argptr;
char text[1024];
diff --git a/code/cgame/cg_syscalls.cpp b/code/cgame/cg_syscalls.cpp
index 264e5c4..7c20a9c 100644
--- a/code/cgame/cg_syscalls.cpp
+++ b/code/cgame/cg_syscalls.cpp
@@ -46,7 +46,7 @@ void cgi_Printf( const char *fmt ) {
Q_syscall( CG_PRINT, fmt );
}
-void cgi_Error( const char *fmt ) {
+NORETURN void cgi_Error( const char *fmt ) {
Q_syscall( CG_ERROR, fmt );
// shut up GCC warning about returning functions, because we know better
exit(1);
diff --git a/code/game/g_public.h b/code/game/g_public.h
index 8ca8785..e9f3b78 100644
--- a/code/game/g_public.h
+++ b/code/game/g_public.h
@@ -157,9 +157,7 @@ typedef struct {
void (*FlushCamFile)();
// abort the game
- // (this is not NORETURN because MSVC's version of NORETURN is not
- // supported for function pointers)
- __attribute__((noreturn)) void (*Error)( int, const char *fmt, ... );
+ NORETURN_PTR void (*Error)( int, const char *fmt, ... );
// get current time for profiling reasons
// this should NOT be used for any game related tasks,
diff --git a/code/icarus/IcarusImplementation.cpp b/code/icarus/IcarusImplementation.cpp
index f59da29..ba17235 100644
--- a/code/icarus/IcarusImplementation.cpp
+++ b/code/icarus/IcarusImplementation.cpp
@@ -592,7 +592,7 @@ int CIcarus::LoadSignals()
for ( int i = 0; i < numSignals; i++ )
{
char buffer[1024];
- int length;
+ int length = 0;
//Get the size of the string
BufferRead( &length, sizeof( length ) );
diff --git a/code/qcommon/q_shared.h b/code/qcommon/q_shared.h
index 2bd355d..3430e0d 100644
--- a/code/qcommon/q_shared.h
+++ b/code/qcommon/q_shared.h
@@ -141,12 +141,6 @@ along with this program; if not, see <http://www.gnu.org/licenses/>.
#define Q_EXPORT
#endif
-#if defined(__GNUC__)
-#define NORETURN __attribute__((noreturn))
-#elif defined(_MSC_VER)
-#define NORETURN __declspec(noreturn)
-#endif
-
// this is the define for determining if we have an asm version of a C function
#if (defined(_M_IX86) || defined(__i386__)) && !defined(__sun__)
#define id386 1
diff --git a/code/rd-common/tr_public.h b/code/rd-common/tr_public.h
index 40a3186..a0f0ace 100644
--- a/code/rd-common/tr_public.h
+++ b/code/rd-common/tr_public.h
@@ -34,7 +34,7 @@ along with this program; if not, see <http://www.gnu.org/licenses/>.
typedef struct {
void (QDECL *Printf) ( int printLevel, const char *fmt, ...) __attribute__ ((format (printf, 2, 3)));
- void (QDECL *Error) ( int errorLevel, const char *fmt, ...) __attribute__ ((noreturn, format (printf, 2, 3)));
+ void (QDECL *Error) ( int errorLevel, const char *fmt, ...) NORETURN_PTR __attribute__ ((format (printf, 2, 3)));
// milliseconds should only be used for profiling, never for anything game related. Get time from the refdef
int (*Milliseconds) ( void );
diff --git a/code/ui/ui_public.h b/code/ui/ui_public.h
index 6001180..e4f4ced 100644
--- a/code/ui/ui_public.h
+++ b/code/ui/ui_public.h
@@ -38,7 +38,7 @@ typedef struct {
void (*Printf)( const char *fmt, ... );
// abort the game
- void (*Error)( int level, const char *fmt, ... );
+ NORETURN_PTR void (*Error)( int level, const char *fmt, ... );
// console variable interaction
void (*Cvar_Set)( const char *name, const char *value );
diff --git a/codeJK2/cgame/cg_local.h b/codeJK2/cgame/cg_local.h
index 30eb45f..57e6ddb 100644
--- a/codeJK2/cgame/cg_local.h
+++ b/codeJK2/cgame/cg_local.h
@@ -649,7 +649,7 @@ const char *CG_ConfigString( int index );
const char *CG_Argv( int arg );
void QDECL CG_Printf( const char *msg, ... );
-void QDECL CG_Error( const char *msg, ... );
+NORETURN void QDECL CG_Error( const char *msg, ... );
void CG_StartMusic( qboolean bForceStart );
@@ -911,7 +911,7 @@ qboolean CG_Credits_Draw( void );
void cgi_Printf( const char *fmt );
// abort the game
-void cgi_Error( const char *fmt );
+NORETURN void cgi_Error( const char *fmt );
// milliseconds should only be used for performance tuning, never
// for anything game related. Get time from the CG_DrawActiveFrame parameter
diff --git a/codeJK2/cgame/cg_main.cpp b/codeJK2/cgame/cg_main.cpp
index c2bcfa7..a35f446 100644
--- a/codeJK2/cgame/cg_main.cpp
+++ b/codeJK2/cgame/cg_main.cpp
@@ -536,7 +536,7 @@ void CG_Printf( const char *msg, ... ) {
cgi_Printf( text );
}
-void CG_Error( const char *msg, ... ) {
+NORETURN void CG_Error( const char *msg, ... ) {
va_list argptr;
char text[1024];
diff --git a/codeJK2/cgame/cg_syscalls.cpp b/codeJK2/cgame/cg_syscalls.cpp
index 613bb61..d4e637c 100644
--- a/codeJK2/cgame/cg_syscalls.cpp
+++ b/codeJK2/cgame/cg_syscalls.cpp
@@ -45,7 +45,7 @@ void cgi_Printf( const char *fmt ) {
Q_syscall( CG_PRINT, fmt );
}
-void cgi_Error( const char *fmt ) {
+NORETURN void cgi_Error( const char *fmt ) {
Q_syscall( CG_ERROR, fmt );
// shut up GCC warning about returning functions, because we know better
exit(1);
diff --git a/codeJK2/game/AI_Utils.cpp b/codeJK2/game/AI_Utils.cpp
index 2a87946..0ff327a 100644
--- a/codeJK2/game/AI_Utils.cpp
+++ b/codeJK2/game/AI_Utils.cpp
@@ -95,38 +95,6 @@ int AI_GetGroupSize( gentity_t *ent, int radius )
return AI_GetGroupSize( ent->currentOrigin, radius, ent->client->playerTeam, ent );
}
-extern int NAV_FindClosestWaypointForPoint( gentity_t *ent, vec3_t point );
-int AI_ClosestGroupEntityNumToPoint( AIGroupInfo_t &group, vec3_t point )
-{
- int markerWP = WAYPOINT_NONE;
- int cost, bestCost = Q3_INFINITE;
- int closest = ENTITYNUM_NONE;
-
- if ( group.numGroup <= 0 )
- {
- return ENTITYNUM_NONE;
- }
-
- markerWP = NAV_FindClosestWaypointForPoint( &g_entities[group.member[0].number], point );
-
- if ( markerWP == WAYPOINT_NONE )
- {
- return ENTITYNUM_NONE;
- }
-
- for ( int i = 0; i < group.numGroup; i++ )
- {
- cost = navigator.GetPathCost( group.member[i].waypoint, markerWP );
- if ( cost < bestCost )
- {
- bestCost = cost;
- closest = group.member[i].number;
- }
- }
-
- return closest;
-}
-
void AI_SetClosestBuddy( AIGroupInfo_t *group )
{
int i, j;
diff --git a/codeJK2/game/g_public.h b/codeJK2/game/g_public.h
index e9660e6..7186c47 100644
--- a/codeJK2/game/g_public.h
+++ b/codeJK2/game/g_public.h
@@ -147,7 +147,7 @@ typedef struct {
void (*FlushCamFile)();
// abort the game
- void (*Error)( int, const char *fmt, ... );
+ NORETURN_PTR void (*Error)( int level, const char *fmt, ... );
// get current time for profiling reasons
// this should NOT be used for any game related tasks,
diff --git a/codemp/cgame/cg_public.h b/codemp/cgame/cg_public.h
index 36a273b..801aa1b 100644
--- a/codemp/cgame/cg_public.h
+++ b/codemp/cgame/cg_public.h
@@ -476,7 +476,7 @@ typedef enum cgameExportLegacy_e {
typedef struct cgameImport_s {
// common
void (*Print) ( const char *msg, ... );
- void (*Error) ( int level, const char *error, ... );
+ NORETURN_PTR void (*Error)( int level, const char *fmt, ... );
void (*SnapVector) ( float *v );
int (*MemoryRemaining) ( void );
void (*RegisterSharedMemory) ( char *memory );
diff --git a/codemp/cgame/cg_syscalls.c b/codemp/cgame/cg_syscalls.c
index bb056ed..2c905d6 100644
--- a/codemp/cgame/cg_syscalls.c
+++ b/codemp/cgame/cg_syscalls.c
@@ -44,7 +44,7 @@ int PASSFLOAT( float x ) {
void trap_Print( const char *fmt ) {
Q_syscall( CG_PRINT, fmt );
}
-void trap_Error( const char *fmt ) {
+NORETURN void trap_Error( const char *fmt ) {
Q_syscall( CG_ERROR, fmt );
exit(1);
}
@@ -706,7 +706,7 @@ float CGSyscall_R_GetDistanceCull( void ) { float tmp; trap_R_GetDistanceCull( &
void CGSyscall_FX_PlayEffectID( int id, vec3_t org, vec3_t fwd, int vol, int rad, qboolean isPortal ) { if ( isPortal ) trap_FX_PlayPortalEffectID( id, org, fwd, vol, rad ); else trap_FX_PlayEffectID( id, org, fwd, vol, rad ); }
void CGSyscall_G2API_CollisionDetect( CollisionRecord_t *collRecMap, void* ghoul2, const vec3_t angles, const vec3_t position, int frameNumber, int entNum, vec3_t rayStart, vec3_t rayEnd, vec3_t scale, int traceFlags, int useLod, float fRadius ) { trap_G2API_CollisionDetect( collRecMap, ghoul2, angles, position, frameNumber, entNum, rayStart, rayEnd, scale, traceFlags, useLod, fRadius ); }
-void QDECL CG_Error( int level, const char *error, ... ) {
+NORETURN void QDECL CG_Error( int level, const char *error, ... ) {
va_list argptr;
char text[1024] = {0};
diff --git a/codemp/game/NPC_AI_Utils.c b/codemp/game/NPC_AI_Utils.c
index 0271286..23d73c2 100644
--- a/codemp/game/NPC_AI_Utils.c
+++ b/codemp/game/NPC_AI_Utils.c
@@ -97,39 +97,6 @@ int AI_GetGroupSize2( gentity_t *ent, int radius )
return AI_GetGroupSize( ent->r.currentOrigin, radius, (team_t)ent->client->playerTeam, ent );
}
-extern int NAV_FindClosestWaypointForPoint( gentity_t *ent, vec3_t point );
-int AI_ClosestGroupEntityNumToPoint( AIGroupInfo_t *group, vec3_t point )
-{
- int markerWP = WAYPOINT_NONE;
- int cost, bestCost = Q3_INFINITE;
- int closest = ENTITYNUM_NONE;
- int i;
-
- if ( group == NULL || group->numGroup <= 0 )
- {
- return ENTITYNUM_NONE;
- }
-
- markerWP = NAV_FindClosestWaypointForPoint( &g_entities[group->member[0].number], point );
-
- if ( markerWP == WAYPOINT_NONE )
- {
- return ENTITYNUM_NONE;
- }
-
- for ( i = 0; i < group->numGroup; i++ )
- {
- cost = trap->Nav_GetPathCost( group->member[i].waypoint, markerWP );
- if ( cost < bestCost )
- {
- bestCost = cost;
- closest = group->member[i].number;
- }
- }
-
- return closest;
-}
-
void AI_SetClosestBuddy( AIGroupInfo_t *group )
{
int i, j;
diff --git a/codemp/game/g_public.h b/codemp/game/g_public.h
index 4ebeed7..d90e350 100644
--- a/codemp/game/g_public.h
+++ b/codemp/game/g_public.h
@@ -760,7 +760,7 @@ typedef enum gameExportLegacy_e {
typedef struct gameImport_s {
// misc
void (*Print) ( const char *msg, ... );
- void (*Error) ( int level, const char *error, ... );
+ NORETURN_PTR void (*Error)( int level, const char *fmt, ... );
int (*Milliseconds) ( void );
void (*PrecisionTimerStart) ( void **timer );
int (*PrecisionTimerEnd) ( void *timer );
diff --git a/codemp/game/g_syscalls.c b/codemp/game/g_syscalls.c
index 52d0d25..3e49935 100644
--- a/codemp/game/g_syscalls.c
+++ b/codemp/game/g_syscalls.c
@@ -43,7 +43,7 @@ int PASSFLOAT( float x ) {
void trap_Print( const char *fmt ) {
Q_syscall( G_PRINT, fmt );
}
-void trap_Error( const char *fmt ) {
+NORETURN void trap_Error( const char *fmt ) {
Q_syscall( G_ERROR, fmt );
exit(1);
}
@@ -1010,7 +1010,7 @@ void SVSyscall_Trace( trace_t *results, const vec3_t start, const vec3_t mins, c
trap_Trace( results, start, mins, maxs, end, passEntityNum, contentmask );
}
-void QDECL G_Error( int errorLevel, const char *error, ... ) {
+NORETURN void QDECL G_Error( int errorLevel, const char *error, ... ) {
va_list argptr;
char text[1024];
diff --git a/codemp/qcommon/q_shared.h b/codemp/qcommon/q_shared.h
index d845bc8..d499940 100644
--- a/codemp/qcommon/q_shared.h
+++ b/codemp/qcommon/q_shared.h
@@ -130,12 +130,6 @@ along with this program; if not, see <http://www.gnu.org/licenses/>.
#define Q_EXPORT
#endif
-#if defined(__GNUC__)
-#define NORETURN __attribute__((noreturn))
-#elif defined(_MSC_VER)
-#define NORETURN __declspec(noreturn)
-#endif
-
// this is the define for determining if we have an asm version of a C function
#if (defined(_M_IX86) || defined(__i386__)) && !defined(__sun__)
#define id386 1
@@ -693,7 +687,7 @@ qboolean Info_NextPair( const char **s, char *key, char *value );
// this is only here so the functions in q_shared.c and bg_*.c can link
#if defined( _GAME ) || defined( _CGAME ) || defined( UI_BUILD )
- void (*Com_Error)( int level, const char *error, ... );
+ NORETURN_PTR void (*Com_Error)( int level, const char *error, ... );
void (*Com_Printf)( const char *msg, ... );
#else
void NORETURN QDECL Com_Error( int level, const char *error, ... );
diff --git a/codemp/rd-common/tr_public.h b/codemp/rd-common/tr_public.h
index 1042942..f67cd8b 100644
--- a/codemp/rd-common/tr_public.h
+++ b/codemp/rd-common/tr_public.h
@@ -252,7 +252,7 @@ typedef struct refexport_s {
//
typedef struct refimport_s {
void (QDECL *Printf) ( int printLevel, const char *fmt, ...) __attribute__ ((format (printf, 2, 3)));
- void (QDECL *Error) ( int errorLevel, const char *fmt, ...) __attribute__ ((noreturn, format (printf, 2, 3)));
+ void (QDECL *Error) ( int errorLevel, const char *fmt, ...) NORETURN_PTR __attribute__ ((format (printf, 2, 3)));
void (QDECL *OPrintf) ( const char *fmt, ...) __attribute__ ((format (printf, 1, 2)));
// milliseconds should only be used for profiling, never for anything game related. Get time from the refdef
diff --git a/codemp/ui/ui_public.h b/codemp/ui/ui_public.h
index 782c9e5..9cb29cc 100644
--- a/codemp/ui/ui_public.h
+++ b/codemp/ui/ui_public.h
@@ -228,7 +228,7 @@ typedef enum uiExportLegacy_e {
typedef struct uiImport_s {
void (*Print) ( const char *msg, ... );
- void (*Error) ( int level, const char *error, ... );
+ NORETURN_PTR void (*Error)( int level, const char *fmt, ... );
int (*Milliseconds) ( void );
int (*RealTime) ( qtime_t *qtime );
int (*MemoryRemaining) ( void );
diff --git a/codemp/ui/ui_shared.h b/codemp/ui/ui_shared.h
index 51e4a03..6222dfb 100644
--- a/codemp/ui/ui_shared.h
+++ b/codemp/ui/ui_shared.h
@@ -461,7 +461,7 @@ typedef struct displayContextDef_s {
void (*getBindingBuf) ( int keynum, char *buf, int buflen );
void (*setBinding) ( int keynum, const char *binding );
void (*executeText) ( int exec_when, const char *text );
- void (*Error) ( int level, const char *error, ... );
+ NORETURN_PTR void (*Error)( int level, const char *fmt, ... );
void (*Print) ( const char *msg, ... );
void (*Pause) ( qboolean b );
int (*ownerDrawWidth) ( int ownerDraw, float scale );
diff --git a/codemp/ui/ui_syscalls.c b/codemp/ui/ui_syscalls.c
index 97d0746..a2e4d8f 100644
--- a/codemp/ui/ui_syscalls.c
+++ b/codemp/ui/ui_syscalls.c
@@ -43,7 +43,7 @@ int PASSFLOAT( float x ) {
void trap_Print( const char *string ) {
Q_syscall( UI_PRINT, string );
}
-void trap_Error( const char *string ) {
+NORETURN void trap_Error( const char *string ) {
Q_syscall( UI_ERROR, string );
exit(1);
}
@@ -469,7 +469,7 @@ void UISyscall_RemoveCommand( const char *cmd_name )
Com_Printf( S_COLOR_YELLOW "WARNING: trap->ext.RemoveCommand() is only supported with OpenJK mod API!\n" );
}
-void QDECL UI_Error( int level, const char *error, ... ) {
+NORETURN void QDECL UI_Error( int level, const char *error, ... ) {
va_list argptr;
char text[4096] = {0};
diff --git a/shared/qcommon/q_platform.h b/shared/qcommon/q_platform.h
index e9b69bd..bddb7bd 100644
--- a/shared/qcommon/q_platform.h
+++ b/shared/qcommon/q_platform.h
@@ -193,6 +193,18 @@ along with this program; if not, see <http://www.gnu.org/licenses/>.
#define IS_NOEXCEPT(x) noexcept(x)
#endif
+#if defined(__GNUC__)
+#define NORETURN __attribute__((noreturn))
+#define NORETURN_PTR __attribute__((noreturn))
+#elif defined(_MSC_VER)
+#define NORETURN __declspec(noreturn)
+// __declspec doesn't work on function pointers
+#define NORETURN_PTR /* nothing */
+#else
+#define NORETURN /* nothing */
+#define NORETURN_PTR /* nothing */
+#endif
+
#define OVERRIDE override
#if defined(__cplusplus)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/openjk.git
More information about the Pkg-games-commits
mailing list