ioquake
/
gtkradiant
mirror of https://github.com/TTimo/GtkRadiant.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Change winding_t, winding_accu_t and brush_t to use flexible array members rather than fixed-sized arrays. 

The arrays were always meant to be variably sized, and objects are only ever allocated dynamically. Object size computations are simplified with this change.

Flexible arrays were introduced in C99, so this change means that we will require a C99-conforming compiler henceforth.
This commit is contained in:
Thomas Köppe 2018-01-21 02:03:31 +00:00
parent 4ace24c00a
commit f061ce9990
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tools/quake3/common/polylib.c
View File

@ -68,7 +68,7 @@ winding_t *AllocWinding( int points ){
c_peak_windings = c_active_windings; c_peak_windings = c_active_windings;
} }
} }
s = sizeof( vec_t ) * 3 * points + sizeof( int ); s = sizeof( *w ) + points * sizeof( *w->p );
w = safe_malloc( s ); w = safe_malloc( s );
memset( w, 0, s ); memset( w, 0, s );
return w; return w;
@ -96,7 +96,7 @@ winding_accu_t *AllocWindingAccu( int points ){
c_peak_windings = c_active_windings; c_peak_windings = c_active_windings;
} }
} }
s = sizeof(*w) + (points > 4 ? sizeof(vec3_accu_t) * (points - 4) : 0); s = sizeof( *w ) + points * sizeof( *w->p );
w = safe_malloc( s ); w = safe_malloc( s );
memset( w, 0, s ); memset( w, 0, s );
return w; return w;

4
tools/quake3/common/polylib.h
View File

@ -23,7 +23,7 @@
typedef struct typedef struct
{ {
int numpoints; int numpoints;
vec3_t p[4]; // variable sized vec3_t p[];
} winding_t; } winding_t;
#define MAX_POINTS_ON_WINDING 64 #define MAX_POINTS_ON_WINDING 64
@ -65,7 +65,7 @@ void pw( winding_t *w );
typedef struct typedef struct
{ {
int numpoints; int numpoints;
vec3_accu_t p[4]; // variable sized vec3_accu_t p[];
} winding_accu_t; } winding_accu_t;
winding_accu_t *BaseWindingForPlaneAccu( vec3_t normal, vec_t dist ); winding_accu_t *BaseWindingForPlaneAccu( vec3_t normal, vec_t dist );

4
tools/quake3/q3map2/brush.c
View File

@ -93,7 +93,7 @@ brush_t *AllocBrush( int numSides ){
brush_t *bb; brush_t *bb;
size_t c; size_t c;
c = sizeof(*bb) + (numSides > 6 ? sizeof(side_t)*(numSides - 6) : 0); c = sizeof( *bb ) + sizeof( *bb->sides ) * numSides;
bb = safe_malloc( c ); bb = safe_malloc( c );
memset( bb, 0, c ); memset( bb, 0, c );
if ( numthreads == 1 ) { if ( numthreads == 1 ) {
@ -1023,7 +1023,7 @@ void SplitBrush( brush_t *brush, int planenum, brush_t **front, brush_t **back )
for ( i = 0 ; i < 2 ; i++ ) for ( i = 0 ; i < 2 ; i++ )
{ {
b[i] = AllocBrush( brush->numsides + 1 ); b[i] = AllocBrush( brush->numsides + 1 );
memcpy( b[i], brush, sizeof( brush_t ) - sizeof( brush->sides ) ); memcpy( b[i], brush, sizeof( brush_t ) );
b[i]->numsides = 0; b[i]->numsides = 0;
b[i]->next = NULL; b[i]->next = NULL;
b[i]->original = brush->original; b[i]->original = brush->original;

2
tools/quake3/q3map2/q3map2.h
View File

@ -893,7 +893,7 @@ typedef struct brush_s
vec3_t mins, maxs; vec3_t mins, maxs;
int numsides; int numsides;
side_t sides[ 6 ]; /* variably sized */ side_t sides[]; /* variably sized */
} }
brush_t; brush_t;