From d55d5fadf925a70383581eb427a77631480d2bd4 Mon Sep 17 00:00:00 2001 From: Hallvard Furuseth Date: Fri, 17 Oct 2008 21:58:09 +0000 Subject: [PATCH] ITS#5747: Simplify previous fix. Just use the struct hack. --- servers/slapd/overlays/collect.c | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/servers/slapd/overlays/collect.c b/servers/slapd/overlays/collect.c index 680fb9b59f..f01045a958 100644 --- a/servers/slapd/overlays/collect.c +++ b/servers/slapd/overlays/collect.c @@ -42,20 +42,11 @@ * is no effect. If no attribute was configured, there is no effect. */ -/* Use C99 flexible array member if supported, C89 "struct hack" otherwise. */ -#define FLEXIBLE_STRUCT_SIZE(stype, mtype, mcount) \ - (sizeof(stype) + sizeof(mtype) * ((mcount) - (0 FLEXIBLE_ARRAY_MEMBER))) -#if __STDC_VERSION__>=199901L || (defined __GNUC__ && !defined __STRICT_ANSI__) -#define FLEXIBLE_ARRAY_MEMBER -#else -#define FLEXIBLE_ARRAY_MEMBER +1 -#endif - typedef struct collect_info { struct collect_info *ci_next; struct berval ci_dn; int ci_ad_num; - AttributeDescription *ci_ad[FLEXIBLE_ARRAY_MEMBER]; + AttributeDescription *ci_ad[1]; } collect_info; /* @@ -184,8 +175,8 @@ collect_cf( ConfigArgs *c ) } /* allocate config info with room for attribute array */ - ci = ch_malloc( FLEXIBLE_STRUCT_SIZE( collect_info, - AttributeDescription *, count + 1 )); + ci = ch_malloc( sizeof( collect_info ) + + sizeof( AttributeDescription * ) * count ); /* validate and normalize dn */ ber_str2bv( c->argv[1], 0, 0, &bv ); -- 2.39.5