diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2015-02-20 17:32:01 -0500 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2015-02-20 17:32:01 -0500 |
| commit | 33a3b03d636b529b27f869e332b6344d52635331 (patch) | |
| tree | c5227d0a7013626e9fa9c0973075de224bd4fa33 /src/backend/utils/cache/inval.c | |
| parent | c110eff1324f5c882c737ad988191ed4a54c4936 (diff) | |
| download | postgresql-33a3b03d636b529b27f869e332b6344d52635331.tar.gz postgresql-33a3b03d636b529b27f869e332b6344d52635331.zip | |
Use FLEXIBLE_ARRAY_MEMBER in some more places.
Fix a batch of structs that are only visible within individual .c files.
Michael Paquier
Diffstat (limited to 'src/backend/utils/cache/inval.c')
| -rw-r--r-- | src/backend/utils/cache/inval.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/backend/utils/cache/inval.c b/src/backend/utils/cache/inval.c index 0f2192c7252..8826a5d50b2 100644 --- a/src/backend/utils/cache/inval.c +++ b/src/backend/utils/cache/inval.c @@ -122,8 +122,8 @@ typedef struct InvalidationChunk struct InvalidationChunk *next; /* list link */ int nitems; /* # items currently stored in chunk */ int maxitems; /* size of allocated array in this chunk */ - SharedInvalidationMessage msgs[1]; /* VARIABLE LENGTH ARRAY */ -} InvalidationChunk; /* VARIABLE LENGTH STRUCTURE */ + SharedInvalidationMessage msgs[FLEXIBLE_ARRAY_MEMBER]; +} InvalidationChunk; typedef struct InvalidationListHeader { @@ -225,8 +225,8 @@ AddInvalidationMessage(InvalidationChunk **listHdr, #define FIRSTCHUNKSIZE 32 chunk = (InvalidationChunk *) MemoryContextAlloc(CurTransactionContext, - sizeof(InvalidationChunk) + - (FIRSTCHUNKSIZE - 1) *sizeof(SharedInvalidationMessage)); + offsetof(InvalidationChunk, msgs) + + FIRSTCHUNKSIZE * sizeof(SharedInvalidationMessage)); chunk->nitems = 0; chunk->maxitems = FIRSTCHUNKSIZE; chunk->next = *listHdr; @@ -239,8 +239,8 @@ AddInvalidationMessage(InvalidationChunk **listHdr, chunk = (InvalidationChunk *) MemoryContextAlloc(CurTransactionContext, - sizeof(InvalidationChunk) + - (chunksize - 1) *sizeof(SharedInvalidationMessage)); + offsetof(InvalidationChunk, msgs) + + chunksize * sizeof(SharedInvalidationMessage)); chunk->nitems = 0; chunk->maxitems = chunksize; chunk->next = *listHdr; |