diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2015-02-20 00:11:42 -0500 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2015-02-20 00:11:42 -0500 |
| commit | 09d8d110a604e52216102e73fb8475b7aa88f1d1 (patch) | |
| tree | 6ffdaba34c52c319aa32b3cb95cc93cdcefb6d65 /contrib/intarray | |
| parent | 2fb7a75f37d0beca80f45e15736ec8d50064228a (diff) | |
| download | postgresql-09d8d110a604e52216102e73fb8475b7aa88f1d1.tar.gz postgresql-09d8d110a604e52216102e73fb8475b7aa88f1d1.zip | |
Use FLEXIBLE_ARRAY_MEMBER in a bunch more places.
Replace some bogus "x[1]" declarations with "x[FLEXIBLE_ARRAY_MEMBER]".
Aside from being more self-documenting, this should help prevent bogus
warnings from static code analyzers and perhaps compiler misoptimizations.
This patch is just a down payment on eliminating the whole problem, but
it gets rid of a lot of easy-to-fix cases.
Note that the main problem with doing this is that one must no longer rely
on computing sizeof(the containing struct), since the result would be
compiler-dependent. Instead use offsetof(struct, lastfield). Autoconf
also warns against spelling that offsetof(struct, lastfield[0]).
Michael Paquier, review and additional fixes by me.
Diffstat (limited to 'contrib/intarray')
| -rw-r--r-- | contrib/intarray/_int.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/contrib/intarray/_int.h b/contrib/intarray/_int.h index 7f93206e890..d524f0fed53 100644 --- a/contrib/intarray/_int.h +++ b/contrib/intarray/_int.h @@ -73,7 +73,7 @@ typedef struct { int32 vl_len_; /* varlena header (do not touch directly!) */ int32 flag; - char data[1]; + char data[FLEXIBLE_ARRAY_MEMBER]; } GISTTYPE; #define ALLISTRUE 0x04 @@ -133,7 +133,7 @@ typedef struct QUERYTYPE { int32 vl_len_; /* varlena header (do not touch directly!) */ int32 size; /* number of ITEMs */ - ITEM items[1]; /* variable length array */ + ITEM items[FLEXIBLE_ARRAY_MEMBER]; } QUERYTYPE; #define HDRSIZEQT offsetof(QUERYTYPE, items) |