mirror of
https://github.com/postgres/postgres.git
synced 2025-09-02 04:21:28 +03:00
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.
This commit is contained in:
@@ -156,7 +156,7 @@ typedef struct PageHeaderData
|
||||
LocationIndex pd_special; /* offset to start of special space */
|
||||
uint16 pd_pagesize_version;
|
||||
TransactionId pd_prune_xid; /* oldest prunable XID, or zero if none */
|
||||
ItemIdData pd_linp[1]; /* beginning of line pointer array */
|
||||
ItemIdData pd_linp[FLEXIBLE_ARRAY_MEMBER]; /* line pointer array */
|
||||
} PageHeaderData;
|
||||
|
||||
typedef PageHeaderData *PageHeader;
|
||||
|
@@ -39,7 +39,7 @@ typedef struct
|
||||
* NonLeafNodesPerPage elements are upper nodes, and the following
|
||||
* LeafNodesPerPage elements are leaf nodes. Unused nodes are zero.
|
||||
*/
|
||||
uint8 fp_nodes[1];
|
||||
uint8 fp_nodes[FLEXIBLE_ARRAY_MEMBER];
|
||||
} FSMPageData;
|
||||
|
||||
typedef FSMPageData *FSMPage;
|
||||
|
@@ -60,7 +60,7 @@ extern void StandbyReleaseOldLocks(int nxids, TransactionId *xids);
|
||||
typedef struct xl_standby_locks
|
||||
{
|
||||
int nlocks; /* number of entries in locks array */
|
||||
xl_standby_lock locks[1]; /* VARIABLE LENGTH ARRAY */
|
||||
xl_standby_lock locks[FLEXIBLE_ARRAY_MEMBER];
|
||||
} xl_standby_locks;
|
||||
|
||||
/*
|
||||
@@ -75,7 +75,7 @@ typedef struct xl_running_xacts
|
||||
TransactionId oldestRunningXid; /* *not* oldestXmin */
|
||||
TransactionId latestCompletedXid; /* so we can set xmax */
|
||||
|
||||
TransactionId xids[1]; /* VARIABLE LENGTH ARRAY */
|
||||
TransactionId xids[FLEXIBLE_ARRAY_MEMBER];
|
||||
} xl_running_xacts;
|
||||
|
||||
#define MinSizeOfXactRunningXacts offsetof(xl_running_xacts, xids)
|
||||
|
Reference in New Issue
Block a user